wrowe 2003/09/08 07:57:41
Modified: . aprutil.dsp libaprutil.dsp
Log:
Several users (especially those building jk/ant) had observed that
the APR 0.9 files didn't match on Win32 - they were explicitly trying
to locate and bind to libapr-0.dll (to match unix libapr-0.so.) While
binary compatibility prevented us from 'fixing' this discrepancy for
our existing users - nothing prevents us from fixing this going forwards.
This change allows us to locate APR 0.9 and 1.0 binaries and libraries
in the same tree structure, as an added bonus. It would also allow the
APR library to be installed in a common location, such as \windows\system32,
without introducing conflicts between 0.9 and 1.0.
Also note that this patch resorts a number of generated files in MSVC 6's
natural order.
Revision Changes Path
1.56 +36 -36 apr-util/aprutil.dsp
Index: aprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/aprutil.dsp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- aprutil.dsp 7 Sep 2003 19:48:33 -0000 1.55
+++ aprutil.dsp 8 Sep 2003 14:57:41 -0000 1.56
@@ -49,7 +49,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"LibR\aprutil-1.lib"
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
@@ -73,7 +73,7 @@
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"LibD\aprutil-1.lib"
!ENDIF
@@ -372,33 +372,29 @@
# End Source File
# Begin Source File
-SOURCE=.\include\apu_want.h.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apu_want.hnw
+SOURCE=.\include\private\apu_config.h.in
# End Source File
# Begin Source File
-SOURCE=.\include\apu_want.hw
+SOURCE=.\include\private\apu_config.hw
!IF "$(CFG)" == "aprutil - Win32 Release"
-# Begin Custom Build - Creating apu_want.h from apu_want.hw
-InputPath=.\include\apu_want.hw
+# Begin Custom Build - Creating apu_config.h from apu_config.hw
+InputPath=.\include\private\apu_config.hw
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apu_want.hw > .\include\apu_want.h
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\private\apu_config.hw > .\include\private\apu_config.h
# End Custom Build
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
-# Begin Custom Build - Creating apu_want.h from apu_want.hw
-InputPath=.\include\apu_want.hw
+# Begin Custom Build - Creating apu_config.h from apu_config.hw
+InputPath=.\include\private\apu_config.hw
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apu_want.hw > .\include\apu_want.h
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\private\apu_config.hw > .\include\private\apu_config.h
# End Custom Build
@@ -407,29 +403,29 @@
# End Source File
# Begin Source File
-SOURCE=.\include\private\apu_config.h.in
+SOURCE=.\include\private\apu_select_dbm.h.in
# End Source File
# Begin Source File
-SOURCE=.\include\private\apu_config.hw
+SOURCE=.\include\private\apu_select_dbm.hw
!IF "$(CFG)" == "aprutil - Win32 Release"
-# Begin Custom Build - Creating apu_config.h from apu_config.hw
-InputPath=.\include\private\apu_config.hw
+# Begin Custom Build - Creating apu_select_dbm.h from apu_select_dbm.hw
+InputPath=.\include\private\apu_select_dbm.hw
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\private\apu_config.hw > .\include\private\apu_config.h
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\private\apu_select_dbm.hw >
.\include\private\apu_select_dbm.h
# End Custom Build
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
-# Begin Custom Build - Creating apu_config.h from apu_config.hw
-InputPath=.\include\private\apu_config.hw
+# Begin Custom Build - Creating apu_select_dbm.h from apu_select_dbm.hw
+InputPath=.\include\private\apu_select_dbm.hw
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\private\apu_config.hw > .\include\private\apu_config.h
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\private\apu_select_dbm.hw >
.\include\private\apu_select_dbm.h
# End Custom Build
@@ -438,29 +434,33 @@
# End Source File
# Begin Source File
-SOURCE=.\include\private\apu_select_dbm.h.in
+SOURCE=.\include\apu_want.h.in
# End Source File
# Begin Source File
-SOURCE=.\include\private\apu_select_dbm.hw
+SOURCE=.\include\apu_want.hnw
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apu_want.hw
!IF "$(CFG)" == "aprutil - Win32 Release"
-# Begin Custom Build - Creating apu_select_dbm.h from apu_select_dbm.hw
-InputPath=.\include\private\apu_select_dbm.hw
+# Begin Custom Build - Creating apu_want.h from apu_want.hw
+InputPath=.\include\apu_want.hw
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\private\apu_select_dbm.hw >
.\include\private\apu_select_dbm.h
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\apu_want.hw > .\include\apu_want.h
# End Custom Build
!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
-# Begin Custom Build - Creating apu_select_dbm.h from apu_select_dbm.hw
-InputPath=.\include\private\apu_select_dbm.hw
+# Begin Custom Build - Creating apu_want.h from apu_want.hw
+InputPath=.\include\apu_want.hw
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\private\apu_select_dbm.hw >
.\include\private\apu_select_dbm.h
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\apu_want.hw > .\include\apu_want.h
# End Custom Build
1.54 +36 -36 apr-util/libaprutil.dsp
Index: libaprutil.dsp
===================================================================
RCS file: /home/cvs/apr-util/libaprutil.dsp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libaprutil.dsp 18 Aug 2003 10:43:19 -0000 1.53
+++ libaprutil.dsp 8 Sep 2003 14:57:41 -0000 1.54
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
/machine:I386 /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
/machine:I386 /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
/machine:I386 /out:"Release/libaprutil-1.dll" /opt:ref
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
/machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
/machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
/nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
/machine:I386 /out:"Debug/libaprutil-1.dll"
!ENDIF
@@ -378,33 +378,29 @@
# End Source File
# Begin Source File
-SOURCE=.\include\apu_want.h.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apu_want.hnw
+SOURCE=.\include\private\apu_config.h.in
# End Source File
# Begin Source File
-SOURCE=.\include\apu_want.hw
+SOURCE=.\include\private\apu_config.hw
!IF "$(CFG)" == "libaprutil - Win32 Release"
-# Begin Custom Build - Creating apu_want.h from apu_want.hw
-InputPath=.\include\apu_want.hw
+# Begin Custom Build - Creating apu_config.h from apu_config.hw
+InputPath=.\include\private\apu_config.hw
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apu_want.hw > .\include\apu_want.h
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\private\apu_config.hw > .\include\private\apu_config.h
# End Custom Build
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-# Begin Custom Build - Creating apu_want.h from apu_want.hw
-InputPath=.\include\apu_want.hw
+# Begin Custom Build - Creating apu_config.h from apu_config.hw
+InputPath=.\include\private\apu_config.hw
-".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\apu_want.hw > .\include\apu_want.h
+".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\private\apu_config.hw > .\include\private\apu_config.h
# End Custom Build
@@ -413,29 +409,29 @@
# End Source File
# Begin Source File
-SOURCE=.\include\private\apu_config.h.in
+SOURCE=.\include\private\apu_select_dbm.h.in
# End Source File
# Begin Source File
-SOURCE=.\include\private\apu_config.hw
+SOURCE=.\include\private\apu_select_dbm.hw
!IF "$(CFG)" == "libaprutil - Win32 Release"
-# Begin Custom Build - Creating apu_config.h from apu_config.hw
-InputPath=.\include\private\apu_config.hw
+# Begin Custom Build - Creating apu_select_dbm.h from apu_select_dbm.hw
+InputPath=.\include\private\apu_select_dbm.hw
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\private\apu_config.hw > .\include\private\apu_config.h
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\private\apu_select_dbm.hw >
.\include\private\apu_select_dbm.h
# End Custom Build
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-# Begin Custom Build - Creating apu_config.h from apu_config.hw
-InputPath=.\include\private\apu_config.hw
+# Begin Custom Build - Creating apu_select_dbm.h from apu_select_dbm.hw
+InputPath=.\include\private\apu_select_dbm.hw
-".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\private\apu_config.hw > .\include\private\apu_config.h
+".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\private\apu_select_dbm.hw >
.\include\private\apu_select_dbm.h
# End Custom Build
@@ -444,29 +440,33 @@
# End Source File
# Begin Source File
-SOURCE=.\include\private\apu_select_dbm.h.in
+SOURCE=.\include\apu_want.h.in
# End Source File
# Begin Source File
-SOURCE=.\include\private\apu_select_dbm.hw
+SOURCE=.\include\apu_want.hnw
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apu_want.hw
!IF "$(CFG)" == "libaprutil - Win32 Release"
-# Begin Custom Build - Creating apu_select_dbm.h from apu_select_dbm.hw
-InputPath=.\include\private\apu_select_dbm.hw
+# Begin Custom Build - Creating apu_want.h from apu_want.hw
+InputPath=.\include\apu_want.hw
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\private\apu_select_dbm.hw >
.\include\private\apu_select_dbm.h
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\apu_want.hw > .\include\apu_want.h
# End Custom Build
!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-# Begin Custom Build - Creating apu_select_dbm.h from apu_select_dbm.hw
-InputPath=.\include\private\apu_select_dbm.hw
+# Begin Custom Build - Creating apu_want.h from apu_want.hw
+InputPath=.\include\apu_want.hw
-".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\include\private\apu_select_dbm.hw >
.\include\private\apu_select_dbm.h
+".\include\apu_want.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ type .\include\apu_want.hw > .\include\apu_want.h
# End Custom Build
