I've done a ton of thinking about these issues.
1) Once Greg finishes his fine work exporting symbols, we need
no def files whatsoever for our dll (or certainly no symbol
names, even if we keep them for versioning/descriptions.)
2) We should simply build the sources in both static and
dynamic models. My argument against has always been
maintanance, and with no more maintance required on .def
files, adding a new file in both apr.dsp and libapr.dsp
really isn't that bad.
Greg, and anyone interested, attached is the patch that will
'break' the libapr from apr and libaprutil from aprutil.
This can go in once all the symbols are APR/APU_DECLARE'ed.
I'll catch with Ryan if you throw :-) I have some deeper
issues and bug tracking to get finished on 2.0 so thank you,
Greg, for picking up on this!
Bill
Index: Apache.dsw
===================================================================
RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
retrieving revision 1.41
diff -u -r1.41 Apache.dsw
--- Apache.dsw 2001/01/04 22:37:27 1.41
+++ Apache.dsw 2001/01/12 03:41:18
@@ -3,6 +3,24 @@
###############################################################################
+Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libhttpd
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "InstallBin"=".\InstallBin.dsp" - Package Owner=<4>
Package=<5>
@@ -69,7 +87,7 @@
###############################################################################
-Project: "apr"=".\srclib\apr\apr.dsp" - Package Owner=<4>
+Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -77,11 +95,17 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name apr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name aprutil
+ End Project Dependency
}}}
###############################################################################
-Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
+Project: "apr"=".\srclib\apr\apr.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -93,7 +117,7 @@
###############################################################################
-Project: "libapr"=".\srclib\apr\libapr.dsp" - Package Owner=<4>
+Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -108,7 +132,7 @@
###############################################################################
-Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
+Project: "dftables"=".\srclib\pcre\dftables.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -116,17 +140,11 @@
Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name aprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
}}}
###############################################################################
-Project: "libexpat"=".\srclib\expat-lite\libexpat.dsp" - Package Owner=<4>
+Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -138,7 +156,7 @@
###############################################################################
-Project: "dftables"=".\srclib\pcre\dftables.dsp" - Package Owner=<4>
+Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -150,7 +168,7 @@
###############################################################################
-Project: "pcre"=".\srclib\pcre\pcre.dsp" - Package Owner=<4>
+Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -159,13 +177,16 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name dftables
+ Project_Dep_Name apr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name aprutil
End Project Dependency
}}}
###############################################################################
-Project: "pcreposix"=".\srclib\pcre\pcreposix.dsp" - Package Owner=<4>
+Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -174,13 +195,16 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name pcre
+ Project_Dep_Name apr
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name aprutil
+ End Project Dependency
}}}
###############################################################################
-Project: "gen_test_char"=".\server\gen_test_char.dsp" - Package Owner=<4>
+Project: "httpd"=".\httpd.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -188,11 +212,23 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name libapr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libaprutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name gen_test_char
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name gen_uri_delims
+ End Project Dependency
}}}
###############################################################################
-Project: "gen_uri_delims"=".\server\gen_uri_delims.dsp" - Package Owner=<4>
+Project: "libapr"=".\srclib\apr\libapr.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -204,7 +240,7 @@
###############################################################################
-Project: "httpd"=".\httpd.dsp" - Package Owner=<4>
+Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -215,19 +251,22 @@
Begin Project Dependency
Project_Dep_Name libapr
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libaprutil
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name gen_test_char
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name gen_uri_delims
- End Project Dependency
}}}
###############################################################################
+Project: "libexpat"=".\srclib\expat-lite\libexpat.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "libhttpd"=".\libhttpd.dsp" - Package Owner=<4>
Package=<5>
@@ -258,6 +297,18 @@
###############################################################################
+Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "mod_auth_anon"=".\modules\aaa\mod_auth_anon.dsp" - Package Owner=<4>
Package=<5>
@@ -349,7 +400,7 @@
End Project Dependency
Begin Project Dependency
Project_Dep_Name libaprutil
- End Project Dependency
+ End Project Dependency
Begin Project Dependency
Project_Dep_Name libhttpd
End Project Dependency
@@ -542,44 +593,8 @@
}}}
###############################################################################
-
-Project: "Apache"=".\Apache.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name libapr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libhttpd
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ab"=".\support\ab.dsp" - Package Owner=<4>
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name apr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name aprutil
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "htdigest"=".\support\htdigest.dsp" - Package Owner=<4>
+Project: "pcre"=".\srclib\pcre\pcre.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -587,17 +602,14 @@
Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name apr
- End Project Dependency
Begin Project Dependency
- Project_Dep_Name aprutil
+ Project_Dep_Name dftables
End Project Dependency
}}}
###############################################################################
-Project: "htpasswd"=".\support\htpasswd.dsp" - Package Owner=<4>
+Project: "pcreposix"=".\srclib\pcre\pcreposix.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -606,23 +618,8 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name apr
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name aprutil
+ Project_Dep_Name pcre
End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "logresolve"=".\support\logresolve.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
}}}
###############################################################################
Index: srclib/apr/apr.dsp
===================================================================
RCS file: /home/cvs/apr/apr.dsp,v
retrieving revision 1.59
diff -u -r1.59 apr.dsp
--- srclib/apr/apr.dsp 2001/01/04 21:41:35 1.59
+++ srclib/apr/apr.dsp 2001/01/12 03:41:34
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "LibR"
# 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 "./include/arch" /I
"./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D
"APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apr" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "./include/arch" /I
"./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D
"APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apr" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -64,8 +64,8 @@
# PROP Intermediate_Dir "LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# 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 "./include/arch" /I
"./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D
"APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr" /FD /c
+# 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 "./include/arch" /I
"./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D
"APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -518,9 +518,5 @@
SOURCE=.\include\apr_xlate.h
# End Source File
# End Group
-# Begin Source File
-
-SOURCE=.\libapr.def
-# End Source File
# End Target
# End Project
Index: srclib/apr/libapr.dsp
===================================================================
RCS file: /home/cvs/apr/libapr.dsp,v
retrieving revision 1.17
diff -u -r1.17 libapr.dsp
--- srclib/apr/libapr.dsp 2000/12/21 01:24:57 1.17
+++ srclib/apr/libapr.dsp 2001/01/12 03:41:34
@@ -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 "./include/arch" /I
"./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D
"APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\libapr" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "./include/arch" /I
"./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D
"APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\apr" /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"
@@ -52,8 +52,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map
/machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map
/machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map
/machine:I386 /OPT:NOREF
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map
/machine:I386 /OPT:NOREF
!ELSEIF "$(CFG)" == "libapr - Win32 Debug"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# 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 "./include/arch" /I
"./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D
"APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libapr" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./include/arch" /I
"./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D
"APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\apr" /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"
@@ -78,8 +78,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map /debug
/machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map /debug
/machine:I386
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map /debug
/machine:I386 /OPT:NOREF
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map /debug
/machine:I386 /OPT:NOREF
!ENDIF
@@ -87,13 +87,442 @@
# Name "libapr - Win32 Release"
# Name "libapr - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".c"
+# Begin Group "time"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\time\win32\access.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\atime.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\time\win32\time.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\time\win32\timestr.c
+# End Source File
+# End Group
+# Begin Group "strings"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\strings\apr_cpystrn.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_fnmatch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_snprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_strings.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_strnatcmp.c
+# End Source File
+# End Group
+# Begin Group "passwd"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\passwd\apr_getpass.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\passwd\apr_md5.c
+# End Source File
+# End Group
+# Begin Group "tables"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\tables\apr_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tables\apr_tables.c
+# End Source File
+# End Group
+# Begin Group "misc"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\misc\unix\errorcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\getuuid.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\misc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\unix\misc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\names.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\rand.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\start.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\uuid.c
+# End Source File
+# End Group
+# Begin Group "file_io"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\file_io\win32\canonfile.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\dir.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\unix\fileacc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\filedup.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\fileio.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\filestat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\flock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\unix\fullrw.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\pipe.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\readwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\seek.c
+# End Source File
+# End Group
+# Begin Group "locks"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\locks\win32\locks.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\locks.h
+# End Source File
+# End Group
+# Begin Group "network_io"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\network_io\unix\inet_ntop.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\networkio.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\poll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\unix\sa_common.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sendrecv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockaddr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockets.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockopt.c
+# End Source File
+# End Group
+# Begin Group "threadproc"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\threadproc\win32\proc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\signals.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\thread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\threadpriv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\threadproc.h
+# End Source File
+# End Group
+# Begin Group "dso"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\dso\win32\dso.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\dso.h
+# End Source File
+# End Group
+# Begin Group "lib"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\lib\apr_pools.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\lib\apr_signal.c
+# End Source File
+# End Group
+# Begin Group "i18n"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\arch\unix\i18n.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\i18n\unix\utf8_ucs2.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\i18n\unix\xlate.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Group "shmem"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\shmem\win32\shmem.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Group "mmap"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\mmap\unix\common.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mmap\win32\mmap.c
+# End Source File
+# End Group
+# End Group
+# Begin Group "Generated Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\apr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr.h.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr.hw
+
+!IF "$(CFG)" == "libapr - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\include\apr.hw
+
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\apr.hw .\include\apr.h > nul
+ echo Created apr.h from apr.hw
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "libapr - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\apr.hw
+
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\apr.hw .\include\apr.h > nul
+ echo Created apr.h from apr.hw
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\apr_private.h
+# End Source File
+# End Group
+# Begin Group "External Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\apr_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_dso.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_errno.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_file_io.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_fnmatch.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_general.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_getopt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_lock.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_mmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_network_io.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_pools.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_portable.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_shmem.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_strings.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_tables.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_thread_proc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_time.h
+# End Source File
# Begin Source File
-SOURCE=.\misc\win32\libapr.c
+SOURCE=.\include\apr_uuid.h
# End Source File
# Begin Source File
-SOURCE=.\libapr.def
+SOURCE=.\include\apr_xlate.h
# End Source File
+# End Group
# End Target
# End Project
Index: srclib/apr-util/libaprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/libaprutil.dsp,v
retrieving revision 1.5
diff -u -r1.5 libaprutil.dsp
--- srclib/apr-util/libaprutil.dsp 2000/12/21 18:06:12 1.5
+++ srclib/apr-util/libaprutil.dsp 2001/01/12 03:42:11
@@ -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 "./src/dbm/sdbm" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_STATIC" /D "APU_USE_SDBM" /Fd"Release\aprutil" /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 "./src/dbm/sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D
"APU_DECLARE_STATIC" /D "APU_USE_SDBM" /Fd"Debug\aprutil" /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"
@@ -87,13 +87,223 @@
# Name "libaprutil - Win32 Release"
# Name "libaprutil - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Group "buckets"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_eos.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_file.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_flush.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_heap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_mmap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_pipe.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_pool.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_refcount.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_simple.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\buckets\ap_buckets_socket.c
+# End Source File
+# End Group
+# Begin Group "crypto"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\crypto\ap_sha1.c
+# End Source File
+# End Group
+# Begin Group "dbm"
+
+# PROP Default_Filter ""
+# Begin Group "sdbm"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_lock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_pair.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_pair.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_private.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dbm\sdbm\sdbm_tune.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\src\dbm\apr_dbm.c
+# End Source File
+# End Group
+# Begin Group "encoding"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\encoding\ap_base64.c
+# End Source File
+# End Group
+# Begin Group "hooks"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\hooks\ap_hooks.c
+# End Source File
+# End Group
+# Begin Group "uri"
+
+# PROP Default_Filter ""
+# End Group
+# Begin Group "xml"
+
+# PROP Default_Filter ""
+# End Group
+# End Group
+# Begin Group "Generated Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\apu.h.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apu.hw
+
+!IF "$(CFG)" == "libaprutil - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\apu.hw .\include\apu.h > nul
+ echo Created apu.h from apu.hw
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\apu.hw
+
+".\include\apu.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\apu.hw .\include\apu.h > nul
+ echo Created apu.h from apu.hw
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\private\apu_private.hw
+
+!IF "$(CFG)" == "libaprutil - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\include\private\apu_private.hw
+
+".\include\private\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\private\apu_private.hw .\include\private\apu_private.h >
nul
+ echo Created apu_private.h from apu_private.hw
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\private\apu_private.hw
+
+".\include\private\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ copy .\include\private\apu_private.hw .\include\private\apu_private.h >
nul
+ echo Created apu_private.h from apu_private.hw
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "External Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\ap_base64.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\ap_buckets.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\ap_hooks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\ap_ring.h
+# End Source File
# Begin Source File
-SOURCE=.\src\misc\win32\libaprutil.c
+SOURCE=.\include\ap_sha1.h
# End Source File
# Begin Source File
-SOURCE=.\libaprutil.def
+SOURCE=.\include\apr_dbm.h
# End Source File
+# End Group
# End Target
# End Project
