You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@apache.org on 2016/12/06 08:28:22 UTC
svn commit: r1772840 - in /apr/apr-util/branches/1.6.x: Makefile.win
aprutil.dsp aprutil.dsw aprutil.mak libaprutil.dsp libaprutil.mak
test/Makefile.win xml/xml.dep xml/xml.dsp xml/xml.mak
Author: gsmith
Date: Tue Dec 6 08:28:22 2016
New Revision: 1772840
URL: http://svn.apache.org/viewvc?rev=1772840&view=rev
Log:
get legacy build up to date
restore modified xml build, user supplies expat source
Added:
apr/apr-util/branches/1.6.x/xml/xml.dep (with props)
apr/apr-util/branches/1.6.x/xml/xml.dsp (with props)
apr/apr-util/branches/1.6.x/xml/xml.mak (with props)
Modified:
apr/apr-util/branches/1.6.x/Makefile.win
apr/apr-util/branches/1.6.x/aprutil.dsp
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=1772840&r1=1772839&r2=1772840&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/Makefile.win (original)
+++ apr/apr-util/branches/1.6.x/Makefile.win Tue Dec 6 08:28:22 2016
@@ -56,6 +56,17 @@
# nmake -f Makefile.win PREFIX=C:\APR buildall checkall installall clean
#
+!IF EXIST("xml\expat\lib\expat.h")
+!ELSEIF
+!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
@@ -197,9 +208,9 @@ buildall:
BUILD_MODE="$(ARCH)" BIND_MODE=shared
cd ..
!ENDIF
- cd $(APU_PATH)\xml\expat\lib
+ cd $(APU_PATH)\xml
$(MAKE) $(MAKEOPT) -f xml.mak CFG="xml - $(ARCH)" RECURSE=0 $(CTARGET)
- cd ..\..\..
+ cd ..
$(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
cd ldap
@@ -306,7 +317,7 @@ checkapr:
checkapu:
cd $(APU_PATH)
cd test
- $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
+ $(MAKE) $(MAKEOPT) -f Makefile.win MODEL=static \
OUTDIR=$(LIBSPATH) APROUTDIR=$(LIBSOSPATH) \
APR_PATH=..\$(APR_PATH) API_PATH=..\$(API_PATH) check
$(MAKE) $(MAKEOPT) -f Makefile.win MODEL=dynamic \
Modified: apr/apr-util/branches/1.6.x/aprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/aprutil.dsp?rev=1772840&r1=1772839&r2=1772840&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/aprutil.dsp (original)
+++ apr/apr-util/branches/1.6.x/aprutil.dsp Tue Dec 6 08:28:22 2016
@@ -43,7 +43,7 @@ RSC=rc.exe
# 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 /Oy- /Zi /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprutil-1" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "../apr/include" /I "./include/private" /I "./xml/expat/lib" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprutil-1" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,7 @@ LIB32=link.exe -lib
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprutil-1" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /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_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprutil-1" /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -90,7 +90,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "x64\LibR"
# 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 "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprutil-1" /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_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprutil-1" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -114,7 +114,7 @@ LIB32=link.exe -lib
# 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 "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprutil-1" /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_STATIC" /D "APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "APU_USE_SDBM" /D "HAVE_SQL_H" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\aprutil-1" /FD /EHsc /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
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=1772840&r1=1772839&r2=1772840&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/aprutil.dsw (original)
+++ apr/apr-util/branches/1.6.x/aprutil.dsw Tue Dec 6 08:28:22 2016
@@ -453,6 +453,18 @@ Package=<4>
###############################################################################
+Project: "xml"=".\xml\xml.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Global:
Package=<5>
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=1772840&r1=1772839&r2=1772840&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/aprutil.mak (original)
+++ apr/apr-util/branches/1.6.x/aprutil.mak Tue Dec 6 08:28:22 2016
@@ -89,6 +89,7 @@ CLEAN :
-@erase "$(INTDIR)\apr_memcache.obj"
-@erase "$(INTDIR)\apr_passwd.obj"
-@erase "$(INTDIR)\apr_queue.obj"
+ -@erase "$(INTDIR)\apr_redis.obj"
-@erase "$(INTDIR)\apr_reslist.obj"
-@erase "$(INTDIR)\apr_rmm.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -200,6 +201,7 @@ LIB32_OBJS= \
"$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apu_dso.obj" \
"$(INTDIR)\apr_queue.obj" \
+ "$(INTDIR)\apr_redis.obj" \
"$(INTDIR)\apr_reslist.obj" \
"$(INTDIR)\apr_rmm.obj" \
"$(INTDIR)\apr_thread_pool.obj" \
@@ -213,7 +215,7 @@ LIB32_OBJS= \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
"..\apr-iconv\LibR\apriconv-1.lib" \
- ".\xml\expat\lib\LibR\xml.lib"
+ ".\xml\LibR\xml.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -282,6 +284,7 @@ CLEAN :
-@erase "$(INTDIR)\apr_memcache.obj"
-@erase "$(INTDIR)\apr_passwd.obj"
-@erase "$(INTDIR)\apr_queue.obj"
+ -@erase "$(INTDIR)\apr_redis.obj"
-@erase "$(INTDIR)\apr_reslist.obj"
-@erase "$(INTDIR)\apr_rmm.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -398,6 +401,7 @@ LIB32_OBJS= \
"$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apu_dso.obj" \
"$(INTDIR)\apr_queue.obj" \
+ "$(INTDIR)\apr_redis.obj" \
"$(INTDIR)\apr_reslist.obj" \
"$(INTDIR)\apr_rmm.obj" \
"$(INTDIR)\apr_thread_pool.obj" \
@@ -411,7 +415,7 @@ LIB32_OBJS= \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
"..\apr-iconv\LibD\apriconv-1.lib" \
- ".\xml\expat\lib\LibD\xml.lib"
+ ".\xml\LibD\xml.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -480,6 +484,7 @@ CLEAN :
-@erase "$(INTDIR)\apr_memcache.obj"
-@erase "$(INTDIR)\apr_passwd.obj"
-@erase "$(INTDIR)\apr_queue.obj"
+ -@erase "$(INTDIR)\apr_redis.obj"
-@erase "$(INTDIR)\apr_reslist.obj"
-@erase "$(INTDIR)\apr_rmm.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -596,6 +601,7 @@ LIB32_OBJS= \
"$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apu_dso.obj" \
"$(INTDIR)\apr_queue.obj" \
+ "$(INTDIR)\apr_redis.obj" \
"$(INTDIR)\apr_reslist.obj" \
"$(INTDIR)\apr_rmm.obj" \
"$(INTDIR)\apr_thread_pool.obj" \
@@ -609,7 +615,7 @@ LIB32_OBJS= \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
"..\apr-iconv\x64\LibR\apriconv-1.lib" \
- ".\xml\expat\lib\x64\LibR\xml.lib"
+ ".\xml\x64\LibR\xml.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -678,6 +684,7 @@ CLEAN :
-@erase "$(INTDIR)\apr_memcache.obj"
-@erase "$(INTDIR)\apr_passwd.obj"
-@erase "$(INTDIR)\apr_queue.obj"
+ -@erase "$(INTDIR)\apr_redis.obj"
-@erase "$(INTDIR)\apr_reslist.obj"
-@erase "$(INTDIR)\apr_rmm.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -794,6 +801,7 @@ LIB32_OBJS= \
"$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apu_dso.obj" \
"$(INTDIR)\apr_queue.obj" \
+ "$(INTDIR)\apr_redis.obj" \
"$(INTDIR)\apr_reslist.obj" \
"$(INTDIR)\apr_rmm.obj" \
"$(INTDIR)\apr_thread_pool.obj" \
@@ -807,7 +815,7 @@ LIB32_OBJS= \
"$(INTDIR)\xlate.obj" \
"$(INTDIR)\apr_xml.obj" \
"..\apr-iconv\x64\LibD\apriconv-1.lib" \
- ".\xml\expat\lib\x64\LibD\xml.lib"
+ ".\xml\x64\LibD\xml.lib"
"$(OUTDIR)\aprutil-1.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -1121,6 +1129,12 @@ SOURCE=.\misc\apu_version.c
$(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=.\redis\apr_redis.c
+
+"$(INTDIR)\apr_redis.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_redis.h"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
SOURCE=.\dbm\sdbm\sdbm.c
"$(INTDIR)\sdbm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apu.h"
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=1772840&r1=1772839&r2=1772840&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/libaprutil.dsp (original)
+++ apr/apr-util/branches/1.6.x/libaprutil.dsp Tue Dec 6 08:28:22 2016
@@ -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 "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /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" /D "XML_STATIC" /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"
@@ -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 "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /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" /D "XML_STATIC" /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"
@@ -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 "../apr-iconv/include" /I "./dbm/sdbm" /D "NDEBUG" /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" /D "XML_STATIC" /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"
@@ -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 "../apr-iconv/include" /I "./dbm/sdbm" /D "_DEBUG" /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" /D "XML_STATIC" /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"
@@ -417,6 +417,14 @@ SOURCE=.\misc\apr_thread_pool.c
SOURCE=.\misc\apu_version.c
# End Source File
# End Group
+# Begin Group "redis"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\redis\apr_redis.c
+# End Source File
+# End Group
# Begin Group "sdbm"
# PROP Default_Filter ""
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=1772840&r1=1772839&r2=1772840&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/libaprutil.mak (original)
+++ apr/apr-util/branches/1.6.x/libaprutil.mak Tue Dec 6 08:28:22 2016
@@ -78,6 +78,7 @@ CLEAN :
-@erase "$(INTDIR)\apr_memcache.obj"
-@erase "$(INTDIR)\apr_passwd.obj"
-@erase "$(INTDIR)\apr_queue.obj"
+ -@erase "$(INTDIR)\apr_redis.obj"
-@erase "$(INTDIR)\apr_reslist.obj"
-@erase "$(INTDIR)\apr_rmm.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -109,7 +110,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" /D "NDEBUG" /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" /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
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -185,6 +186,7 @@ LINK32_OBJS= \
"$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apu_dso.obj" \
"$(INTDIR)\apr_queue.obj" \
+ "$(INTDIR)\apr_redis.obj" \
"$(INTDIR)\apr_reslist.obj" \
"$(INTDIR)\apr_rmm.obj" \
"$(INTDIR)\apr_thread_pool.obj" \
@@ -200,7 +202,7 @@ LINK32_OBJS= \
"$(INTDIR)\libaprutil.res" \
"..\apr\Release\libapr-1.lib" \
"..\apr-iconv\Release\libapriconv-1.lib" \
- ".\xml\expat\lib\LibR\xml.lib"
+ ".\xml\LibR\xml.lib"
"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -271,6 +273,7 @@ CLEAN :
-@erase "$(INTDIR)\apr_memcache.obj"
-@erase "$(INTDIR)\apr_passwd.obj"
-@erase "$(INTDIR)\apr_queue.obj"
+ -@erase "$(INTDIR)\apr_redis.obj"
-@erase "$(INTDIR)\apr_reslist.obj"
-@erase "$(INTDIR)\apr_rmm.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -306,7 +309,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" /D "_DEBUG" /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" /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
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -382,6 +385,7 @@ LINK32_OBJS= \
"$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apu_dso.obj" \
"$(INTDIR)\apr_queue.obj" \
+ "$(INTDIR)\apr_redis.obj" \
"$(INTDIR)\apr_reslist.obj" \
"$(INTDIR)\apr_rmm.obj" \
"$(INTDIR)\apr_thread_pool.obj" \
@@ -397,7 +401,7 @@ LINK32_OBJS= \
"$(INTDIR)\libaprutil.res" \
"..\apr\Debug\libapr-1.lib" \
"..\apr-iconv\Debug\libapriconv-1.lib" \
- ".\xml\expat\lib\LibD\xml.lib"
+ ".\xml\LibD\xml.lib"
"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -468,6 +472,7 @@ CLEAN :
-@erase "$(INTDIR)\apr_memcache.obj"
-@erase "$(INTDIR)\apr_passwd.obj"
-@erase "$(INTDIR)\apr_queue.obj"
+ -@erase "$(INTDIR)\apr_redis.obj"
-@erase "$(INTDIR)\apr_reslist.obj"
-@erase "$(INTDIR)\apr_rmm.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -503,7 +508,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" /D "NDEBUG" /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" /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
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -579,6 +584,7 @@ LINK32_OBJS= \
"$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apu_dso.obj" \
"$(INTDIR)\apr_queue.obj" \
+ "$(INTDIR)\apr_redis.obj" \
"$(INTDIR)\apr_reslist.obj" \
"$(INTDIR)\apr_rmm.obj" \
"$(INTDIR)\apr_thread_pool.obj" \
@@ -594,7 +600,7 @@ LINK32_OBJS= \
"$(INTDIR)\libaprutil.res" \
"..\apr\x64\Release\libapr-1.lib" \
"..\apr-iconv\x64\Release\libapriconv-1.lib" \
- ".\xml\expat\lib\x64\LibR\xml.lib"
+ ".\xml\x64\LibR\xml.lib"
"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -665,6 +671,7 @@ CLEAN :
-@erase "$(INTDIR)\apr_memcache.obj"
-@erase "$(INTDIR)\apr_passwd.obj"
-@erase "$(INTDIR)\apr_queue.obj"
+ -@erase "$(INTDIR)\apr_redis.obj"
-@erase "$(INTDIR)\apr_reslist.obj"
-@erase "$(INTDIR)\apr_rmm.obj"
-@erase "$(INTDIR)\apr_sha1.obj"
@@ -700,7 +707,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" /D "_DEBUG" /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" /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
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -776,6 +783,7 @@ LINK32_OBJS= \
"$(INTDIR)\apr_date.obj" \
"$(INTDIR)\apu_dso.obj" \
"$(INTDIR)\apr_queue.obj" \
+ "$(INTDIR)\apr_redis.obj" \
"$(INTDIR)\apr_reslist.obj" \
"$(INTDIR)\apr_rmm.obj" \
"$(INTDIR)\apr_thread_pool.obj" \
@@ -791,7 +799,7 @@ LINK32_OBJS= \
"$(INTDIR)\libaprutil.res" \
"..\apr\x64\Debug\libapr-1.lib" \
"..\apr-iconv\x64\Debug\libapriconv-1.lib" \
- ".\xml\expat\lib\x64\LibD\xml.lib"
+ ".\xml\x64\LibD\xml.lib"
"$(OUTDIR)\libaprutil-1.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -1058,6 +1066,12 @@ SOURCE=.\misc\apu_version.c
$(CPP) $(CPP_PROJ) $(SOURCE)
+SOURCE=.\redis\apr_redis.c
+
+"$(INTDIR)\apr_redis.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr_redis.h"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
SOURCE=.\dbm\sdbm\sdbm.c
"$(INTDIR)\sdbm.obj" : $(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=1772840&r1=1772839&r2=1772840&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/test/Makefile.win (original)
+++ apr/apr-util/branches/1.6.x/test/Makefile.win Tue Dec 6 08:28:22 2016
@@ -62,6 +62,7 @@ ALL_TESTS = $(INTDIR)\teststrmatch.obj $
$(INTDIR)\testxml.obj $(INTDIR)\testqueue.obj \
$(INTDIR)\testrmm.obj $(INTDIR)\testxlate.obj \
$(INTDIR)\testdate.obj $(INTDIR)\testmemcache.obj \
+ $(INTDIR)\testredis.obj $(INTDIR)\testsiphash.obj \
$(INTDIR)\testcrypto.obj
CLEAN_DATA = manyfile.bin testfile.txt data\sqlite*.db
@@ -89,7 +90,7 @@ APROUTDIR=$(OUTDIR)
PROGRAM_DEPENDENCIES = \
$(APR_PATH)\$(APROUTDIR)\apr-1.lib \
$(API_PATH)\$(OUTDIR)\apriconv-1.lib \
- ..\xml\expat\lib\$(OUTDIR)\xml.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
Added: apr/apr-util/branches/1.6.x/xml/xml.dep
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/xml/xml.dep?rev=1772840&view=auto
==============================================================================
--- apr/apr-util/branches/1.6.x/xml/xml.dep (added)
+++ apr/apr-util/branches/1.6.x/xml/xml.dep Tue Dec 6 08:28:22 2016
@@ -0,0 +1,2 @@
+# Microsoft Developer Studio Generated Dependency File, included by xml.mak
+
Propchange: apr/apr-util/branches/1.6.x/xml/xml.dep
------------------------------------------------------------------------------
svn:eol-style = native
Added: apr/apr-util/branches/1.6.x/xml/xml.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/xml/xml.dsp?rev=1772840&view=auto
==============================================================================
--- apr/apr-util/branches/1.6.x/xml/xml.dsp (added)
+++ apr/apr-util/branches/1.6.x/xml/xml.dsp Tue Dec 6 08:28:22 2016
@@ -0,0 +1,210 @@
+# Microsoft Developer Studio Project File - Name="xml" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=xml - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "xml.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "xml.mak" CFG="xml - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "xml - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "LibR"
+# PROP BASE Intermediate_Dir "LibR"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "LibR"
+# PROP Intermediate_Dir "LibR"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"LibR\xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "LibD"
+# PROP BASE Intermediate_Dir "LibD"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "LibD"
+# PROP Intermediate_Dir "LibD"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"LibD\xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\LibR"
+# PROP BASE Intermediate_Dir "x64\LibR"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\LibR"
+# PROP Intermediate_Dir "x64\LibR"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"x64\LibR\xml.lib"
+
+!ELSEIF "$(CFG)" == "xml - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\LibD"
+# PROP BASE Intermediate_Dir "x64\LibD"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\LibD"
+# PROP Intermediate_Dir "x64\LibD"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"x64\LibD\xml.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "xml - Win32 Release"
+# Name "xml - Win32 Debug"
+# Name "xml - x64 Release"
+# Name "xml - x64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\expat\lib\xmlparse.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\xmlrole.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\xmltok.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\xmltok_impl.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\xmltok_ns.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\expat\lib\ascii.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\asciitab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\expat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\iasciitab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\latin1tab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\nametab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\utf8tab.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\winconfig.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\xmlrole.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\xmltok.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\expat\lib\xmltok_impl.h
+# End Source File
+# End Group
+# End Target
+# End Project
Propchange: apr/apr-util/branches/1.6.x/xml/xml.dsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: apr/apr-util/branches/1.6.x/xml/xml.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/xml/xml.mak?rev=1772840&view=auto
==============================================================================
--- apr/apr-util/branches/1.6.x/xml/xml.mak (added)
+++ apr/apr-util/branches/1.6.x/xml/xml.mak Tue Dec 6 08:28:22 2016
@@ -0,0 +1,353 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on xml.dsp
+!IF "$(CFG)" == ""
+CFG=xml - Win32 Release
+!MESSAGE No configuration specified. Defaulting to xml - Win32 Release.
+!ENDIF
+
+!IF "$(CFG)" != "xml - Win32 Release" && "$(CFG)" != "xml - Win32 Debug" && "$(CFG)" != "xml - x64 Release" && "$(CFG)" != "xml - x64 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "xml.mak" CFG="xml - Win32 Release"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+!IF "$(CFG)" == "xml - Win32 Release"
+
+OUTDIR=.\LibR
+INTDIR=.\LibR
+# Begin Custom Macros
+OutDir=.\LibR
+# End Custom Macros
+
+ALL : "$(OUTDIR)\xml.lib"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\xml.idb"
+ -@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\xmlparse.obj"
+ -@erase "$(INTDIR)\xmlrole.obj"
+ -@erase "$(INTDIR)\xmltok.obj"
+ -@erase "$(OUTDIR)\xml.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\xmlparse.obj" \
+ "$(INTDIR)\xmlrole.obj" \
+ "$(INTDIR)\xmltok.obj"
+
+"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "xml - Win32 Debug"
+
+OUTDIR=.\LibD
+INTDIR=.\LibD
+# Begin Custom Macros
+OutDir=.\LibD
+# End Custom Macros
+
+ALL : "$(OUTDIR)\xml.lib"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\xml.idb"
+ -@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\xmlparse.obj"
+ -@erase "$(INTDIR)\xmlrole.obj"
+ -@erase "$(INTDIR)\xmltok.obj"
+ -@erase "$(OUTDIR)\xml.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\xmlparse.obj" \
+ "$(INTDIR)\xmlrole.obj" \
+ "$(INTDIR)\xmltok.obj"
+
+"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "xml - x64 Release"
+
+OUTDIR=.\x64\LibR
+INTDIR=.\x64\LibR
+# Begin Custom Macros
+OutDir=.\x64\LibR
+# End Custom Macros
+
+ALL : "$(OUTDIR)\xml.lib"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\xml.idb"
+ -@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\xmlparse.obj"
+ -@erase "$(INTDIR)\xmlrole.obj"
+ -@erase "$(INTDIR)\xmltok.obj"
+ -@erase "$(OUTDIR)\xml.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\xmlparse.obj" \
+ "$(INTDIR)\xmlrole.obj" \
+ "$(INTDIR)\xmltok.obj"
+
+"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "xml - x64 Debug"
+
+OUTDIR=.\x64\LibD
+INTDIR=.\x64\LibD
+# Begin Custom Macros
+OutDir=.\x64\LibD
+# End Custom Macros
+
+ALL : "$(OUTDIR)\xml.lib"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\xml.idb"
+ -@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\xmlparse.obj"
+ -@erase "$(INTDIR)\xmlrole.obj"
+ -@erase "$(INTDIR)\xmltok.obj"
+ -@erase "$(OUTDIR)\xml.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\xmlparse.obj" \
+ "$(INTDIR)\xmlrole.obj" \
+ "$(INTDIR)\xmltok.obj"
+
+"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("xml.dep")
+!INCLUDE "xml.dep"
+!ELSE
+!MESSAGE Warning: cannot find "xml.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug" || "$(CFG)" == "xml - x64 Release" || "$(CFG)" == "xml - x64 Debug"
+SOURCE=.\expat\lib\xmlparse.c
+
+"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\expat\lib\xmlrole.c
+
+"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\expat\lib\xmltok.c
+
+"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\expat\lib\xmltok_impl.c
+SOURCE=.\expat\lib\xmltok_ns.c
+
+!ENDIF
+
Propchange: apr/apr-util/branches/1.6.x/xml/xml.mak
------------------------------------------------------------------------------
svn:eol-style = native