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...@apache.org on 2008/05/30 00:34:43 UTC
svn commit: r661510 - in /apr/apr-util/trunk: Makefile.win aprutil.dsp
libaprutil.dsp
Author: wrowe
Date: Thu May 29 15:34:42 2008
New Revision: 661510
URL: http://svn.apache.org/viewvc?rev=661510&view=rev
Log:
Fix dso/ldap build elements and combined build target info.
Modified:
apr/apr-util/trunk/Makefile.win
apr/apr-util/trunk/aprutil.dsp
apr/apr-util/trunk/libaprutil.dsp
Modified: apr/apr-util/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/Makefile.win?rev=661510&r1=661509&r2=661510&view=diff
==============================================================================
--- apr/apr-util/trunk/Makefile.win (original)
+++ apr/apr-util/trunk/Makefile.win Thu May 29 15:34:42 2008
@@ -165,8 +165,8 @@
$(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - $(ARCH)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - $(ARCH)" RECURSE=0 $(CTARGET)
cd build
- $(MAKE) $(MAKEOPT) -f aprapp.mak CFG="aprapp - $(ARCH)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f libaprapp.mak CFG="libaprapp - $(ARCH)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f aprapp.mak CFG="aprapp - $(ARCH)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f libaprapp.mak CFG="libaprapp - $(ARCH)" RECURSE=0 $(CTARGET)
cd ..
cd $(API_PATH)
$(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - $(ARCH)" RECURSE=0 $(CTARGET)
@@ -198,8 +198,16 @@
$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
cd $(APU_PATH)
+ -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapriconv
+ -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apriconv
+ -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprapp
+ -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprapp
+ -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapr
+ -devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr
buildall:
+ devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprapp
+ devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprapp
devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprutil
devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprutil
@@ -213,9 +221,17 @@
$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
cd $(APU_PATH)
+ -msdev aprutil.dsw /USEENV /MAKE "libapriconv - $(ARCH)" /CLEAN
+ -msdev aprutil.dsw /USEENV /MAKE "apriconv - $(ARCH)" /CLEAN
+ -msdev aprutil.dsw /USEENV /MAKE "libaprapp - $(ARCH)" /CLEAN
+ -msdev aprutil.dsw /USEENV /MAKE "aprapp - $(ARCH)" /CLEAN
+ -msdev aprutil.dsw /USEENV /MAKE "libapr - $(ARCH)" /CLEAN
+ -msdev aprutil.dsw /USEENV /MAKE "apr - $(ARCH)" /CLEAN
buildall:
+ @msdev aprutil.dsw /USEENV /MAKE "aprapp - $(ARCH)"
@msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)"
+ @msdev aprutil.dsw /USEENV /MAKE "libaprapp - $(ARCH)"
@msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
!ENDIF
Modified: apr/apr-util/trunk/aprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/aprutil.dsp?rev=661510&r1=661509&r2=661510&view=diff
==============================================================================
--- apr/apr-util/trunk/aprutil.dsp (original)
+++ apr/apr-util/trunk/aprutil.dsp Thu May 29 15:34:42 2008
@@ -291,11 +291,15 @@
# End Source File
# Begin Source File
-SOURCE=.\ldap\apr_ldap_url.c
+SOURCE=.\ldap\apr_ldap_option.c
# End Source File
# Begin Source File
-SOURCE=.\ldap\apr_ldap_option.c
+SOURCE=.\ldap\apr_ldap_rebind.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldap\apr_ldap_url.c
# End Source File
# End Group
# Begin Group "memcache"
@@ -315,6 +319,10 @@
# End Source File
# Begin Source File
+SOURCE=.\misc\apu_dso.c
+# End Source File
+# Begin Source File
+
SOURCE=.\misc\apr_queue.c
# End Source File
# Begin Source File
Modified: apr/apr-util/trunk/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/libaprutil.dsp?rev=661510&r1=661509&r2=661510&view=diff
==============================================================================
--- apr/apr-util/trunk/libaprutil.dsp (original)
+++ apr/apr-util/trunk/libaprutil.dsp Thu May 29 15:34:42 2008
@@ -54,8 +54,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Release\libaprutil-1.dll" /pdb:"Release\libaprutil-1.pdb" /implib:"Release\libaprutil-1.lib" /MACHINE:X86 /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Release\libaprutil-1.dll" /pdb:"Release\libaprutil-1.pdb" /implib:"Release\libaprutil-1.lib" /MACHINE:X86 /opt:ref
# Begin Special Build Tool
TargetPath=Release\libaprutil-1.dll
SOURCE="$(InputPath)"
@@ -86,8 +86,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\libaprutil-1.dll" /pdb:"Debug\libaprutil-1.pdb" /implib:"Debug\libaprutil-1.lib" /MACHINE:X86
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\libaprutil-1.dll" /pdb:"Debug\libaprutil-1.pdb" /implib:"Debug\libaprutil-1.lib" /MACHINE:X86
# Begin Special Build Tool
TargetPath=Debug\libaprutil-1.dll
SOURCE="$(InputPath)"
@@ -118,8 +118,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\libaprutil-1.dll" /pdb:"x64\Release\libaprutil-1.pdb" /implib:"x64\Release\libaprutil-1.lib" /MACHINE:X64 /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\libaprutil-1.dll" /pdb:"x64\Release\libaprutil-1.pdb" /implib:"x64\Release\libaprutil-1.lib" /MACHINE:X64 /opt:ref
# Begin Special Build Tool
TargetPath=x64\Release\libaprutil-1.dll
SOURCE="$(InputPath)"
@@ -150,8 +150,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\libaprutil-1.dll" /pdb:"x64\Debug\libaprutil-1.pdb" /implib:"x64\Debug\libaprutil-1.lib" /MACHINE:X64
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\libaprutil-1.dll" /pdb:"x64\Debug\libaprutil-1.pdb" /implib:"x64\Debug\libaprutil-1.lib" /MACHINE:X64
# Begin Special Build Tool
TargetPath=x64\Debug\libaprutil-1.dll
SOURCE="$(InputPath)"
@@ -323,15 +323,22 @@
# Begin Source File
SOURCE=.\ldap\apr_ldap_init.c
+# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
-SOURCE=.\ldap\apr_ldap_url.c
+SOURCE=.\ldap\apr_ldap_option.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldap\apr_ldap_rebind.c
+# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
-SOURCE=.\ldap\apr_ldap_option.c
-# End Source File
+SOURCE=.\ldap\apr_ldap_url.c
+# End Source File
# End Group
# Begin Group "memcache"
@@ -350,6 +357,10 @@
# End Source File
# Begin Source File
+SOURCE=.\misc\apu_dso.c
+# End Source File
+# Begin Source File
+
SOURCE=.\misc\apr_queue.c
# End Source File
# Begin Source File