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 2017/09/27 17:55:13 UTC
svn commit: r1809893 - in /apr/apr-util/branches/1.6.x: Makefile.win
aprutil.dsw aprutil.mak libaprutil.dsp libaprutil.mak test/Makefile.win
xml/xml.dep xml/xml.dsp xml/xml.mak
Author: wrowe
Date: Wed Sep 27 17:55:13 2017
New Revision: 1809893
URL: http://svn.apache.org/viewvc?rev=1809893&view=rev
Log:
Unplug project files no longer maintained by the ASF, and
instead rely on the user provisioning the expat project as
originating from that project (which was the point of our
exercise of dropping this dependency.)
This Windows behavior now mirrors unix policy.
Makefile.win can recognize XML_PARSER=libexpat (default)
as the shared library, and presumes the libexpatMT.lib
static library is always preferred in the libaprutil.lib
non-dll flavor of apr.
See Makefile.win for commentary
Removed:
apr/apr-util/branches/1.6.x/xml/xml.dep
apr/apr-util/branches/1.6.x/xml/xml.dsp
apr/apr-util/branches/1.6.x/xml/xml.mak
Modified:
apr/apr-util/branches/1.6.x/Makefile.win
apr/apr-util/branches/1.6.x/aprutil.dsw
apr/apr-util/branches/1.6.x/aprutil.mak
apr/apr-util/branches/1.6.x/libaprutil.dsp
apr/apr-util/branches/1.6.x/libaprutil.mak
apr/apr-util/branches/1.6.x/test/Makefile.win
Modified: apr/apr-util/branches/1.6.x/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/Makefile.win?rev=1809893&r1=1809892&r2=1809893&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/Makefile.win (original)
+++ apr/apr-util/branches/1.6.x/Makefile.win Wed Sep 27 17:55:13 2017
@@ -51,21 +51,18 @@
#
# CRYPTO_LIST="nss openssl"
#
+# Provide the XML_PARSER argument after configuring LIB and INCLUDE with
+# the expat path of the corresponding xml parser, e.g. libexpatMT to choose
+# static, or libexpat (default) to choose the dynamic library for aprutil-1.dll
+# (Static libaprutil-1.lib always presumes libexpatMT with XML_STATIC flag.)
+#
+# XML_PARSER="libexpat"
+#
# For example;
#
# nmake -f Makefile.win PREFIX=C:\APR buildall checkall installall clean
#
-!IF !EXIST("xml\expat\lib\expat.h")
-!MESSAGE Please obtain the latest expat source from http://expat.sourceforge.net/
-!MESSAGE and place it in the xml folder of apr-util so that expat.h is located in
-!MESSAGE apr-util/xml/expat/lib/expat.h and include all the other files in expat's
-!MESSAGE "lib" folder.
-!MESSAGE
-!ERROR Need expat sources to build!
-!ENDIF
-
-
!IF EXIST("aprutil.sln") && ([devenv /help > NUL 2>&1] == 0) \
&& !defined(USEMAK) && !defined(USEDSW)
USESLN=1
@@ -89,6 +86,14 @@ SSLOPT=_HAVE_OSSL110=1
!ENDIF
!ENDIF
+# Legacy default (and unwise alternative) for libapr-1.dll is libexpatMT
+XML_PARSER="libexpat"
+!IF "$(XML_PARSER)" == "libexpat"
+XMLOPT=XML_PARSER=$(XML_PARSER)
+!ELSE
+XMLOPT=XML_PARSER=$(XML_PARSER) XML_OPTIONS="/D XML_STATIC"
+!ENDIF
+
!IF [$(COMSPEC) /c cl /nologo /? \
| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
ARCH=x64 Release
@@ -213,11 +218,9 @@ buildall:
BUILD_MODE="$(ARCH)" BIND_MODE=shared
cd ..
!ENDIF
- cd $(APU_PATH)\xml
- $(MAKE) $(MAKEOPT) -f xml.mak CFG="xml - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ..
- $(MAKE) $(MAKEOPT) $(SSLOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) $(SSLOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
+ cd $(APU_PATH)
+ $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) $(SSLOPT) $(XMLOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
cd ldap
$(MAKE) $(MAKEOPT) -f apr_ldap.mak CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
cd ..
Modified: apr/apr-util/branches/1.6.x/aprutil.dsw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/aprutil.dsw?rev=1809893&r1=1809892&r2=1809893&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/aprutil.dsw (original)
+++ apr/apr-util/branches/1.6.x/aprutil.dsw Wed Sep 27 17:55:13 2017
@@ -257,9 +257,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name apriconv
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name xml
- End Project Dependency
}}}
###############################################################################
@@ -365,9 +362,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name libapriconv_ces_modules
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name xml
- End Project Dependency
}}}
###############################################################################
@@ -434,18 +428,6 @@ Package=<4>
}}}
###############################################################################
-
-Project: "xml"=".\xml\xml.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
Global:
Modified: apr/apr-util/branches/1.6.x/aprutil.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/aprutil.mak?rev=1809893&r1=1809892&r2=1809893&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/aprutil.mak (original)
+++ apr/apr-util/branches/1.6.x/aprutil.mak Wed Sep 27 17:55:13 2017
@@ -47,12 +47,12 @@ ALL : "$(OUTDIR)\aprutil-1.lib"
!ELSE
-ALL : "xml - Win32 Release" "apriconv - Win32 Release" "$(OUTDIR)\aprutil-1.lib"
+ALL : "apriconv - Win32 Release" "$(OUTDIR)\aprutil-1.lib"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"apriconv - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN"
+CLEAN :"apriconv - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -218,8 +218,7 @@ LIB32_OBJS= \
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
- "..\apr-iconv\LibR\apriconv-1.lib" \
- ".\xml\LibR\xml.lib"
+ "..\apr-iconv\LibR\apriconv-1.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -240,12 +239,12 @@ ALL : ".\include\private\apu_select_dbm.
!ELSE
-ALL : "xml - Win32 Debug" "apriconv - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+ALL : "apriconv - Win32 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"apriconv - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN"
+CLEAN :"apriconv - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -416,8 +415,7 @@ LIB32_OBJS= \
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
- "..\apr-iconv\LibD\apriconv-1.lib" \
- ".\xml\LibD\xml.lib"
+ "..\apr-iconv\LibD\apriconv-1.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -438,12 +436,12 @@ ALL : ".\include\private\apu_select_dbm.
!ELSE
-ALL : "xml - x64 Release" "apriconv - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+ALL : "apriconv - x64 Release" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"apriconv - x64 ReleaseCLEAN" "xml - x64 ReleaseCLEAN"
+CLEAN :"apriconv - x64 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -614,8 +612,7 @@ LIB32_OBJS= \
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
- "..\apr-iconv\x64\LibR\apriconv-1.lib" \
- ".\xml\x64\LibR\xml.lib"
+ "..\apr-iconv\x64\LibR\apriconv-1.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -636,12 +633,12 @@ ALL : ".\include\private\apu_select_dbm.
!ELSE
-ALL : "xml - x64 Debug" "apriconv - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
+ALL : "apriconv - x64 Debug" ".\include\private\apu_select_dbm.h" ".\include\private\apu_config.h" ".\include\apu_want.h" ".\include\apu.h" ".\include\apr_ldap.h" "$(OUTDIR)\aprutil-1.lib"
!ENDIF
!IF "$(RECURSE)" == "1"
-CLEAN :"apriconv - x64 DebugCLEAN" "xml - x64 DebugCLEAN"
+CLEAN :"apriconv - x64 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -812,8 +809,7 @@ LIB32_OBJS= \
"$(INTDIR)\apr_uri.obj" \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
- "..\apr-iconv\x64\LibD\apriconv-1.lib" \
- ".\xml\x64\LibD\xml.lib"
+ "..\apr-iconv\x64\LibD\apriconv-1.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -1465,56 +1461,6 @@ InputPath=.\include\apu_want.hw
!ENDIF
-!IF "$(CFG)" == "aprutil - Win32 Release"
-
-"xml - Win32 Release" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release"
- cd "..\..\.."
-
-"xml - Win32 ReleaseCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" RECURSE=1 CLEAN
- cd "..\..\.."
-
-!ELSEIF "$(CFG)" == "aprutil - Win32 Debug"
-
-"xml - Win32 Debug" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug"
- cd "..\..\.."
-
-"xml - Win32 DebugCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1 CLEAN
- cd "..\..\.."
-
-!ELSEIF "$(CFG)" == "aprutil - x64 Release"
-
-"xml - x64 Release" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release"
- cd "..\..\.."
-
-"xml - x64 ReleaseCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" RECURSE=1 CLEAN
- cd "..\..\.."
-
-!ELSEIF "$(CFG)" == "aprutil - x64 Debug"
-
-"xml - x64 Debug" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug"
- cd "..\..\.."
-
-"xml - x64 DebugCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" RECURSE=1 CLEAN
- cd "..\..\.."
-
-!ENDIF
-
!ENDIF
Modified: apr/apr-util/branches/1.6.x/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/libaprutil.dsp?rev=1809893&r1=1809892&r2=1809893&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/libaprutil.dsp (original)
+++ apr/apr-util/branches/1.6.x/libaprutil.dsp Wed Sep 27 17:55:13 2017
@@ -45,7 +45,7 @@ RSC=rc.exe
# 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 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /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"
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
# 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 /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
+# ADD LINK32 $(XML_PARSER).lib 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)"
@@ -77,7 +77,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /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,7 +87,7 @@ BSC32=bscmake.exe
# 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
-# 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
+# ADD LINK32 $(XML_PARSER).lib 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)"
@@ -109,7 +109,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
# 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 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /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"
@@ -119,7 +119,7 @@ BSC32=bscmake.exe
# 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 /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
+# ADD LINK32 $(XML_PARSER).lib 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)"
@@ -141,7 +141,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /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"
@@ -151,7 +151,7 @@ BSC32=bscmake.exe
# 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
-# 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
+# ADD LINK32 $(XML_PARSER).lib 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)"
Modified: apr/apr-util/branches/1.6.x/libaprutil.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/libaprutil.mak?rev=1809893&r1=1809892&r2=1809893&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/libaprutil.mak (original)
+++ apr/apr-util/branches/1.6.x/libaprutil.mak Wed Sep 27 17:55:13 2017
@@ -116,7 +116,7 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -157,7 +157,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapru
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref
+LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref
LINK32_OBJS= \
"$(INTDIR)\apr_brigade.obj" \
"$(INTDIR)\apr_buckets.obj" \
@@ -207,8 +207,7 @@ LINK32_OBJS= \
"$(INTDIR)\apr_xml.obj" \
"$(INTDIR)\libaprutil.res" \
"..\apr\Release\libapr-1.lib" \
- "..\apr-iconv\Release\libapriconv-1.lib" \
- ".\xml\LibR\xml.lib"
+ "..\apr-iconv\Release\libapriconv-1.lib"
"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -315,7 +314,7 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -356,7 +355,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapru
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"
+LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"
LINK32_OBJS= \
"$(INTDIR)\apr_brigade.obj" \
"$(INTDIR)\apr_buckets.obj" \
@@ -406,8 +405,7 @@ LINK32_OBJS= \
"$(INTDIR)\apr_xml.obj" \
"$(INTDIR)\libaprutil.res" \
"..\apr\Debug\libapr-1.lib" \
- "..\apr-iconv\Debug\libapriconv-1.lib" \
- ".\xml\LibD\xml.lib"
+ "..\apr-iconv\Debug\libapriconv-1.lib"
"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -514,7 +512,7 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -555,7 +553,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapru
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref
+LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib" /opt:ref
LINK32_OBJS= \
"$(INTDIR)\apr_brigade.obj" \
"$(INTDIR)\apr_buckets.obj" \
@@ -605,8 +603,7 @@ LINK32_OBJS= \
"$(INTDIR)\apr_xml.obj" \
"$(INTDIR)\libaprutil.res" \
"..\apr\x64\Release\libapr-1.lib" \
- "..\apr-iconv\x64\Release\libapriconv-1.lib" \
- ".\xml\x64\LibR\xml.lib"
+ "..\apr-iconv\x64\Release\libapriconv-1.lib"
"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -713,7 +710,7 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" $(SSLINC) /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" $(XML_OPTIONS) /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -754,7 +751,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libapru
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"
+LINK32_FLAGS=$(XML_PARSER).lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\libaprutil-1.pdb" /debug /out:"$(OUTDIR)\libaprutil-1.dll" /implib:"$(OUTDIR)\libaprutil-1.lib"
LINK32_OBJS= \
"$(INTDIR)\apr_brigade.obj" \
"$(INTDIR)\apr_buckets.obj" \
@@ -804,8 +801,7 @@ LINK32_OBJS= \
"$(INTDIR)\apr_xml.obj" \
"$(INTDIR)\libaprutil.res" \
"..\apr\x64\Debug\libapr-1.lib" \
- "..\apr-iconv\x64\Debug\libapriconv-1.lib" \
- ".\xml\x64\LibD\xml.lib"
+ "..\apr-iconv\x64\Debug\libapriconv-1.lib"
"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -1465,56 +1461,6 @@ InputPath=.\include\apu_want.hw
!ENDIF
-!IF "$(CFG)" == "libaprutil - Win32 Release"
-
-"xml - Win32 Release" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release"
- cd "..\..\.."
-
-"xml - Win32 ReleaseCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" RECURSE=1 CLEAN
- cd "..\..\.."
-
-!ELSEIF "$(CFG)" == "libaprutil - Win32 Debug"
-
-"xml - Win32 Debug" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug"
- cd "..\..\.."
-
-"xml - Win32 DebugCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1 CLEAN
- cd "..\..\.."
-
-!ELSEIF "$(CFG)" == "libaprutil - x64 Release"
-
-"xml - x64 Release" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release"
- cd "..\..\.."
-
-"xml - x64 ReleaseCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Release" RECURSE=1 CLEAN
- cd "..\..\.."
-
-!ELSEIF "$(CFG)" == "libaprutil - x64 Debug"
-
-"xml - x64 Debug" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug"
- cd "..\..\.."
-
-"xml - x64 DebugCLEAN" :
- cd ".\xml\expat\lib"
- $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - x64 Debug" RECURSE=1 CLEAN
- cd "..\..\.."
-
-!ENDIF
-
SOURCE=.\libaprutil.rc
"$(INTDIR)\libaprutil.res" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
Modified: apr/apr-util/branches/1.6.x/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/test/Makefile.win?rev=1809893&r1=1809892&r2=1809893&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/test/Makefile.win (original)
+++ apr/apr-util/branches/1.6.x/test/Makefile.win Wed Sep 27 17:55:13 2017
@@ -90,10 +90,9 @@ APROUTDIR=$(OUTDIR)
PROGRAM_DEPENDENCIES = \
$(APR_PATH)\$(APROUTDIR)\apr-1.lib \
$(API_PATH)\$(OUTDIR)\apriconv-1.lib \
- ..\xml\$(OUTDIR)\xml.lib \
..\$(OUTDIR)\aprutil-1.lib
STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
-STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib
+STATIC_LIBS = libexpatMT.lib odbc32.lib odbccp32.lib wldap32.lib
!ELSE
PROGRAM_DEPENDENCIES = \
$(APR_PATH)\$(APROUTDIR)\libapr-1.lib \