You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@locus.apache.org on 2000/12/12 18:43:38 UTC
cvs commit: apr-util aprutil.def aprutil.dsp aprutildll.dsp
wrowe 00/12/12 09:43:37
Modified: . aprutil.def aprutil.dsp aprutildll.dsp
Log:
Fix build - especially apu_private.h path and create from apu_private.hw
WARNING Win32 builders: please assure the following files are deleted
from your tree before building:
srclib/apr-util/include/apu_private.h
srclib/apr/include/apr_private.h
Revision Changes Path
1.4 +1 -1 apr-util/aprutil.def
Index: aprutil.def
===================================================================
RCS file: /home/cvs/apr-util/aprutil.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- aprutil.def 2000/12/07 21:22:39 1.3
+++ aprutil.def 2000/12/12 17:43:32 1.4
@@ -1,4 +1,4 @@
-; aprutil.def :
+; apr-util.def :
LIBRARY aprutil
DESCRIPTION ''
1.9 +17 -8 apr-util/aprutil.dsp
Index: aprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/aprutil.dsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aprutil.dsp 2000/12/12 15:54:30 1.8
+++ aprutil.dsp 2000/12/12 17:43:33 1.9
@@ -40,8 +40,8 @@
# PROP Output_Dir "LibR"
# PROP Intermediate_Dir "LibR"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "../apr/include" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"LibR/apr-util" /FD /c
+# 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 "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apr-util" /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 /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APU_USE_SDBM" /Fd"LibD/apr-util" /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 "../apr/include" /I "./include/private" /I "./src/dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APU_USE_SDBM" /Fd"LibD\apr-util" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -86,17 +86,26 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\include\apu_private.hw
+SOURCE=.\include\private\apu_private.hw
!IF "$(CFG)" == "aprutil - 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)" == "aprutil - Win32 Debug"
# Begin Custom Build
-InputPath=.\include\apu_private.hw
+InputPath=.\include\private\apu_private.hw
-".\include\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- copy .\include\private\apu_private.hw .\include\apu_private.h > nul
+".\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
1.2 +8 -10 apr-util/aprutildll.dsp
Index: aprutildll.dsp
===================================================================
RCS file: /home/cvs/apr-util/aprutildll.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aprutildll.dsp 2000/12/05 17:22:21 1.1
+++ aprutildll.dsp 2000/12/12 17:43:33 1.2
@@ -42,9 +42,8 @@
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /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 /c
-# SUBTRACT CPP /YX
+# 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 "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\apr-utildll" /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"
@@ -53,8 +52,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 aprutil.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /map /machine:I386 /out:"Release/aprutil.dll" /libpath:"LibR"
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /map /machine:I386 /out:"Release/aprutil.dll"
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6ED0000" /subsystem:windows /dll /map /machine:I386 /out:"Release/apr-util.dll"
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6ED0000" /subsystem:windows /dll /map /machine:I386 /out:"Release/apr-util.dll"
!ELSEIF "$(CFG)" == "aprutildll - Win32 Debug"
@@ -69,9 +68,8 @@
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /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 /c
-# SUBTRACT CPP /YX
+# 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 "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "APU_USE_SDBM" /Fd"Debug\apr-utildll" /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"
@@ -80,8 +78,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 aprutil.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /map /debug /machine:I386 /out:"Debug/aprutil.dll" /libpath:"LibD"
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /out:"Debug/aprutil.dll"
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6ED0000" /subsystem:windows /dll /map /debug /machine:I386 /out:"Debug/apr-util.dll"
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6ED00000" /subsystem:windows /dll /debug /machine:I386 /out:"Debug/apr-util.dll"
# SUBTRACT LINK32 /incremental:no /map
!ENDIF