wrowe 01/01/17 20:34:44
Modified: . STATUS
. Makefile.in STATUS aprutil.dsp configure.in
libaprutil.dsp
Log:
Upon a vote of 5 to 3 for eliminating the src/ structure, and unanimous
consent that apr and apr-util should share a common structure, the src/
branch of apr-util is orphaned. These files will be deleted at T+1200
from the time of this commit, so if you have changes out there, save
them in the new structure or set them aside. cvs update will destroy
them as of tommorow morning.
Win32 build is corrected, unix may (?) be corrected (please review.)
Revision Changes Path
1.23 +1 -8 apr/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apr/STATUS,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- STATUS 2001/01/18 02:25:06 1.22
+++ STATUS 2001/01/18 04:34:43 1.23
@@ -1,5 +1,5 @@
APACHE PORTABLE RUNTIME (APR) LIBRARY STATUS:
-*-text-*-
-Last modified at [$Date: 2001/01/18 02:25:06 $]
+Last modified at [$Date: 2001/01/18 04:34:43 $]
Release:
@@ -14,13 +14,6 @@
2.0a1 : released March 10, 2000
RELEASE SHOWSTOPPERS:
-
- * This vote ends on Wednesday!
- Source code layout needs to be decided for apr and apr-util. There
- has been some discussion about adding a src/ directory to apr or
- removing it from apr-util/. Either way, this needs to be decided.
- Those for adding apr/src/ : gstein, jim, brane
- Those for removing apr-util/src/ : wrowe, rbb , dreid, stoddard,
fielding
* Many linkage errors are gpfaulting Apache/win32 in various configs
(load mod_dav, for example.) Must complete the APR_DECLARES
1.18 +3 -3 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 2001/01/09 09:41:26 1.17
+++ Makefile.in 2001/01/18 04:34:43 1.18
@@ -10,7 +10,7 @@
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
-SUBDIRS = src . test build
+SUBDIRS = buckets crypto dbm encoding hooks uri xml . test build
CLEAN_TARGETS = $(TARGET_EXPORTS)
DISTCLEAN_TARGETS = config.cache config.log config.status \
@@ -24,7 +24,7 @@
delete-lib:
@if test -f $(TARGET_LIB); then \
- objects="`find src -name '*.lo' -a -newer $(TARGET_LIB)`" ; \
+ objects="`find . -name '*.lo' -a -newer $(TARGET_LIB)`" ; \
if test -n "$$objects"; then \
echo Found newer objects. Will relink $(TARGET_LIB). ; \
echo $(RM) -f $(TARGET_LIB) ; \
@@ -33,7 +33,7 @@
fi
$(TARGET_LIB):
- @objects="`find src -name '*.lo'`" ; \
+ @objects="`find . -name '*.lo'`" ; \
echo $(LINK) $$objects ; \
$(LINK) -rpath $(libdir) $$objects
1.16 +1 -6 apr-util/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apr-util/STATUS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- STATUS 2001/01/13 13:28:00 1.15
+++ STATUS 2001/01/18 04:34:43 1.16
@@ -1,5 +1,5 @@
APRUTIL LIBRARY STATUS:
-*-text-*-
-Last modified at [$Date: 2001/01/13 13:28:00 $]
+Last modified at [$Date: 2001/01/18 04:34:43 $]
Release:
...on the 12th as part of Apache 2.0a9 [need specifics here]
@@ -19,11 +19,6 @@
Gregory Nicholes is working on this, with quick response from rbb
Will Rowe will fold over the libapr.dsp into it's own library
and remove the exports from the simple apr.dsp once it's done.
-
- * Source code layout needs to be decided for apr and apr-util. There
- has been some discussion about adding a src/ directory to apr or
removing
- it from apr-util/. Either way, this needs to be decided.
- Status: See vote in apr/STATUS
* release distros do not include a "test" dir. don't put it in the
top-level SUBDIRS list, but definitely get it cleaned for the
1.14 +25 -25 apr-util/aprutil.dsp
Index: aprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/aprutil.dsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- aprutil.dsp 2001/01/18 00:04:41 1.13
+++ aprutil.dsp 2001/01/18 04:34:44 1.14
@@ -43,7 +43,7 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
/c
-# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I
"./include/private" /I "./src/dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"LibR\aprutil" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I
"./include/private" /I "./dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"LibR\aprutil" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -68,7 +68,7 @@
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I
"./include/private" /I "./src/dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"LibD\aprutil" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I
"./include/private" /I "./dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"LibD\aprutil" /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -90,51 +90,51 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\src\buckets\ap_brigade.c
+SOURCE=.\buckets\ap_brigade.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets.c
+SOURCE=.\buckets\ap_buckets.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_eos.c
+SOURCE=.\buckets\ap_buckets_eos.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_file.c
+SOURCE=.\buckets\ap_buckets_file.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_flush.c
+SOURCE=.\buckets\ap_buckets_flush.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_heap.c
+SOURCE=.\buckets\ap_buckets_heap.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_mmap.c
+SOURCE=.\buckets\ap_buckets_mmap.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_pipe.c
+SOURCE=.\buckets\ap_buckets_pipe.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_pool.c
+SOURCE=.\buckets\ap_buckets_pool.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_refcount.c
+SOURCE=.\buckets\ap_buckets_refcount.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_simple.c
+SOURCE=.\buckets\ap_buckets_simple.c
# End Source File
# Begin Source File
-SOURCE=.\src\buckets\ap_buckets_socket.c
+SOURCE=.\buckets\ap_buckets_socket.c
# End Source File
# End Group
# Begin Group "crypto"
@@ -142,7 +142,7 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\src\crypto\ap_sha1.c
+SOURCE=.\crypto\ap_sha1.c
# End Source File
# End Group
# Begin Group "dbm"
@@ -153,36 +153,36 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\src\dbm\sdbm\sdbm.c
+SOURCE=.\dbm\sdbm\sdbm.c
# End Source File
# Begin Source File
-SOURCE=.\src\dbm\sdbm\sdbm_hash.c
+SOURCE=.\dbm\sdbm\sdbm_hash.c
# End Source File
# Begin Source File
-SOURCE=.\src\dbm\sdbm\sdbm_lock.c
+SOURCE=.\dbm\sdbm\sdbm_lock.c
# End Source File
# Begin Source File
-SOURCE=.\src\dbm\sdbm\sdbm_pair.c
+SOURCE=.\dbm\sdbm\sdbm_pair.c
# End Source File
# Begin Source File
-SOURCE=.\src\dbm\sdbm\sdbm_pair.h
+SOURCE=.\dbm\sdbm\sdbm_pair.h
# End Source File
# Begin Source File
-SOURCE=.\src\dbm\sdbm\sdbm_private.h
+SOURCE=.\dbm\sdbm\sdbm_private.h
# End Source File
# Begin Source File
-SOURCE=.\src\dbm\sdbm\sdbm_tune.h
+SOURCE=.\dbm\sdbm\sdbm_tune.h
# End Source File
# End Group
# Begin Source File
-SOURCE=.\src\dbm\apr_dbm.c
+SOURCE=.\dbm\apr_dbm.c
# End Source File
# End Group
# Begin Group "encoding"
@@ -190,7 +190,7 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\src\encoding\ap_base64.c
+SOURCE=.\encoding\ap_base64.c
# End Source File
# End Group
# Begin Group "hooks"
@@ -198,7 +198,7 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\src\hooks\ap_hooks.c
+SOURCE=.\hooks\ap_hooks.c
# End Source File
# End Group
# Begin Group "uri"
1.10 +8 -9 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.in 2001/01/07 01:35:49 1.9
+++ configure.in 2001/01/18 04:34:44 1.10
@@ -81,14 +81,13 @@
build/rules.mk
include/private/apu_private.h
include/apu.h
- src/Makefile
- src/buckets/Makefile
- src/crypto/Makefile
- src/dbm/Makefile
- src/dbm/sdbm/Makefile
- src/encoding/Makefile
- src/hooks/Makefile
- src/uri/Makefile
- src/xml/Makefile
+ buckets/Makefile
+ crypto/Makefile
+ dbm/Makefile
+ dbm/sdbm/Makefile
+ encoding/Makefile
+ hooks/Makefile
+ uri/Makefile
+ xml/Makefile
$test_Makefile
])
1.6 +3 -3 apr-util/libaprutil.dsp
Index: libaprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/libaprutil.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libaprutil.dsp 2000/12/21 18:06:12 1.5
+++ libaprutil.dsp 2001/01/18 04:34:44 1.6
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
/c
-# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I
"./include/private" /I "./src/dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Release\libaprutil" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I
"./include/private" /I "./dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Release\libaprutil" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/FD /ZI /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I
"./include/private" /I "./src/dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Debug\libaprutil" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I
"./include/private" /I "./dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Debug\libaprutil" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -89,7 +89,7 @@
# Name "libaprutil - Win32 Debug"
# Begin Source File
-SOURCE=.\src\misc\win32\libaprutil.c
+SOURCE=.\misc\win32\libaprutil.c
# End Source File
# Begin Source File
