apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1003376 - in /apr/apr-util/branches/1.3.x: libaprutil.mak xml/expat/lib/xml.dep xml/expat/lib/xml.mak
Date Fri, 01 Oct 2010 03:32:49 GMT
Author: wrowe
Date: Fri Oct  1 03:32:49 2010
New Revision: 1003376

URL: http://svn.apache.org/viewvc?rev=1003376&view=rev
Log:
Update complete to expat 1.95.7, build is golden on win32

Modified:
    apr/apr-util/branches/1.3.x/libaprutil.mak
    apr/apr-util/branches/1.3.x/xml/expat/lib/xml.dep
    apr/apr-util/branches/1.3.x/xml/expat/lib/xml.mak

Modified: apr/apr-util/branches/1.3.x/libaprutil.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/libaprutil.mak?rev=1003376&r1=1003375&r2=1003376&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/libaprutil.mak (original)
+++ apr/apr-util/branches/1.3.x/libaprutil.mak Fri Oct  1 03:32:49 2010
@@ -105,7 +105,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 "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 "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) @<<
@@ -294,7 +294,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 "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 "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) @<<
@@ -483,7 +483,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 "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 "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) @<<
@@ -672,7 +672,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 "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 "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) @<<

Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/xml.dep
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/xml.dep?rev=1003376&r1=1003375&r2=1003376&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/xml.dep (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/xml.dep Fri Oct  1 03:32:49 2010
@@ -1,8 +1,8 @@
 # Microsoft Developer Studio Generated Dependency File, included by xml.mak
 
 .\xmlparse.c : \
-	".\config.h"\
 	".\expat.h"\
+	".\internal.h"\
 	".\winconfig.h"\
 	".\xmlrole.h"\
 	".\xmltok.h"\
@@ -10,7 +10,7 @@
 
 .\xmlrole.c : \
 	".\ascii.h"\
-	".\config.h"\
+	".\internal.h"\
 	".\winconfig.h"\
 	".\xmlrole.h"\
 	".\xmltok.h"\
@@ -19,8 +19,8 @@
 .\xmltok.c : \
 	".\ascii.h"\
 	".\asciitab.h"\
-	".\config.h"\
 	".\iasciitab.h"\
+	".\internal.h"\
 	".\latin1tab.h"\
 	".\nametab.h"\
 	".\utf8tab.h"\
@@ -30,24 +30,3 @@
 	".\xmltok_impl.h"\
 	".\xmltok_ns.c"\
 	
-
-!IF  "$(CFG)" == "xml - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "xml - x64 Release"
-
-!ELSEIF  "$(CFG)" == "xml - x64 Debug"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "xml - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "xml - x64 Release"
-
-!ELSEIF  "$(CFG)" == "xml - x64 Debug"
-
-!ENDIF 
-

Modified: apr/apr-util/branches/1.3.x/xml/expat/lib/xml.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/xml/expat/lib/xml.mak?rev=1003376&r1=1003375&r2=1003376&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/xml/expat/lib/xml.mak (original)
+++ apr/apr-util/branches/1.3.x/xml/expat/lib/xml.mak Fri Oct  1 03:32:49 2010
@@ -50,7 +50,7 @@ CLEAN :
     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 VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c 
+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) @<<
@@ -107,7 +107,7 @@ INTDIR=.\LibD
 OutDir=.\LibD
 # End Custom Macros
 
-ALL : ".\expat.h" ".\config.h" "$(OUTDIR)\xml.lib"
+ALL : "$(OUTDIR)\xml.lib"
 
 
 CLEAN :
@@ -117,14 +117,12 @@ CLEAN :
 	-@erase "$(INTDIR)\xmlrole.obj"
 	-@erase "$(INTDIR)\xmltok.obj"
 	-@erase "$(OUTDIR)\xml.lib"
-	-@erase ".\config.h"
-	-@erase ".\expat.h"
 
 "$(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 VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c 
+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) @<<
@@ -181,7 +179,7 @@ INTDIR=.\x64\LibR
 OutDir=.\x64\LibR
 # End Custom Macros
 
-ALL : ".\expat.h" ".\config.h" "$(OUTDIR)\xml.lib"
+ALL : "$(OUTDIR)\xml.lib"
 
 
 CLEAN :
@@ -191,14 +189,12 @@ CLEAN :
 	-@erase "$(INTDIR)\xmlrole.obj"
 	-@erase "$(INTDIR)\xmltok.obj"
 	-@erase "$(OUTDIR)\xml.lib"
-	-@erase ".\config.h"
-	-@erase ".\expat.h"
 
 "$(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 VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c 
+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) @<<
@@ -255,7 +251,7 @@ INTDIR=.\x64\LibD
 OutDir=.\x64\LibD
 # End Custom Macros
 
-ALL : ".\expat.h" ".\config.h" "$(OUTDIR)\xml.lib"
+ALL : "$(OUTDIR)\xml.lib"
 
 
 CLEAN :
@@ -265,14 +261,12 @@ CLEAN :
 	-@erase "$(INTDIR)\xmlrole.obj"
 	-@erase "$(INTDIR)\xmltok.obj"
 	-@erase "$(OUTDIR)\xml.lib"
-	-@erase ".\config.h"
-	-@erase ".\expat.h"
 
 "$(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 VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c 
+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) @<<
@@ -336,117 +330,21 @@ LIB32_OBJS= \
 !IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug" || "$(CFG)" == "xml
- x64 Release" || "$(CFG)" == "xml - x64 Debug"
 SOURCE=.\xmlparse.c
 
-"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)" ".\winconfig.h" ".\expat.h" ".\config.h"
+"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)"
 
 
 SOURCE=.\xmlrole.c
 
-"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)" ".\winconfig.h" ".\config.h"
+"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)"
 
 
 SOURCE=.\xmltok.c
 
-"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)" ".\winconfig.h" ".\config.h"
+"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)"
 
 
 SOURCE=xmltok_impl.c
 SOURCE=xmltok_ns.c
-SOURCE=.\expat.h.in
-
-!IF  "$(CFG)" == "xml - Win32 Release"
-
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\expat.h.in > .\expat.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug"
-
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\expat.h.in > .\expat.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "xml - x64 Release"
-
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\expat.h.in > .\expat.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "xml - x64 Debug"
-
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\expat.h.in > .\expat.h
-<< 
-	
-
-!ENDIF 
-
-SOURCE=.\winconfig.h
-
-!IF  "$(CFG)" == "xml - Win32 Release"
-
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\winconfig.h > .\config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "xml - Win32 Debug"
-
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\winconfig.h > .\config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "xml - x64 Release"
-
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\winconfig.h > .\config.h
-<< 
-	
-
-!ELSEIF  "$(CFG)" == "xml - x64 Debug"
-
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	<<tempfile.bat 
-	@echo off 
-	type .\winconfig.h > .\config.h
-<< 
-	
-
-!ENDIF 
-
 
 !ENDIF 
 



Mime
View raw message