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 2010/10/09 11:49:24 UTC
svn commit: r1006125 - in /apr/apr-util/branches/0.9.x: libaprutil.dsp
xml/expat/lib/xml.dsp
Author: wrowe
Date: Sat Oct 9 09:49:24 2010
New Revision: 1006125
URL: http://svn.apache.org/viewvc?rev=1006125&view=rev
Log:
Catch up to 1.95.7 changes
Modified:
apr/apr-util/branches/0.9.x/libaprutil.dsp
apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dsp
Modified: apr/apr-util/branches/0.9.x/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/libaprutil.dsp?rev=1006125&r1=1006124&r2=1006125&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/libaprutil.dsp (original)
+++ apr/apr-util/branches/0.9.x/libaprutil.dsp Sat Oct 9 09:49:24 2010
@@ -43,7 +43,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 /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" /Fd"Release\libaprutil_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /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" /Fd"Release\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"
@@ -75,7 +75,7 @@ PostBuild_Cmds=if exist $(OUTDIR)\libapr
# 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" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libaprutil_src" /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" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libaprutil_src" /FD /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"
Modified: apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dsp?rev=1006125&r1=1006124&r2=1006125&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dsp (original)
+++ apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dsp Sat Oct 9 09:49:24 2010
@@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=xml - Win32 Debug
+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
@@ -13,12 +13,14 @@ CFG=xml - Win32 Debug
!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 Debug"
+!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
@@ -41,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" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.7\" /Fd"LibR\xml_src" /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
@@ -49,7 +51,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"LibR\xml.lib"
!ELSEIF "$(CFG)" == "xml - Win32 Debug"
@@ -64,8 +66,8 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "LibD"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.7\" /Fd"LibD\xml_src" /FD /c
+# 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
@@ -73,7 +75,54 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD 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
@@ -81,6 +130,8 @@ LIB32=link.exe -lib
# 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"
@@ -120,10 +171,6 @@ SOURCE=.\asciitab.h
# End Source File
# Begin Source File
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
SOURCE=.\expat.h
# End Source File
# Begin Source File
@@ -144,73 +191,19 @@ SOURCE=.\utf8tab.h
# End Source File
# Begin Source File
-SOURCE=.\xmlrole.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmltok.h
+SOURCE=.\winconfig.h
# End Source File
# Begin Source File
-SOURCE=.\xmltok_impl.h
+SOURCE=.\xmlrole.h
# End Source File
-# End Group
-# Begin Group "Generated Header Files"
-
-# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\expat.h.in
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
-# Begin Custom Build - Creating expat.h from expat.h.in
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\expat.h.in > .\expat.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-# Begin Custom Build - Creating expat.h from expat.h.in
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\expat.h.in > .\expat.h
-
-# End Custom Build
-
-!ENDIF
-
+SOURCE=.\xmltok.h
# End Source File
# Begin Source File
-SOURCE=.\winconfig.h
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
-# Begin Custom Build - Creating config.h from winconfig.h
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\winconfig.h > .\config.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-# Begin Custom Build - Creating config.h from winconfig.h
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\winconfig.h > .\config.h
-
-# End Custom Build
-
-!ENDIF
-
+SOURCE=.\xmltok_impl.h
# End Source File
# End Group
# Begin Source File
Re: svn commit: r1006125 - in /apr/apr-util/branches/0.9.x:
libaprutil.dsp xml/expat/lib/xml.dsp
Posted by Jeff Trawick <tr...@gmail.com>.
On Sat, Oct 9, 2010 at 6:32 AM, Rainer Jung <ra...@kippdata.de> wrote:
> On 09.10.2010 12:10, Eric Covener wrote:
>>
>> On Sat, Oct 9, 2010 at 6:09 AM, William A. Rowe Jr.<wr...@rowe-clan.net>
>> wrote:
>>>
>>> Thanks for the efforts to sync up expat, Ranier!
>>
>> +1!
>
> No need for that. It's a collaborative effort and I had some spare cycles.
> It consisted mostly of copying over what others prepared.
Bask away, Ranier. It is a huge relief to the rest of us when
somebody devotes their supposedly-spare cycles at just the right time.
On to my simpleton tasks of T&R, before &bigco; calls or I get dragged
to a social event, or ...
Re: svn commit: r1006125 - in /apr/apr-util/branches/0.9.x: libaprutil.dsp
xml/expat/lib/xml.dsp
Posted by Rainer Jung <ra...@kippdata.de>.
On 09.10.2010 12:10, Eric Covener wrote:
> On Sat, Oct 9, 2010 at 6:09 AM, William A. Rowe Jr.<wr...@rowe-clan.net> wrote:
>> Thanks for the efforts to sync up expat, Ranier!
>
> +1!
No need for that. It's a collaborative effort and I had some spare
cycles. It consisted mostly of copying over what others prepared.
Regards,
Rainer
Re: svn commit: r1006125 - in /apr/apr-util/branches/0.9.x:
libaprutil.dsp xml/expat/lib/xml.dsp
Posted by Eric Covener <co...@gmail.com>.
On Sat, Oct 9, 2010 at 6:09 AM, William A. Rowe Jr. <wr...@rowe-clan.net> wrote:
> Thanks for the efforts to sync up expat, Ranier!
+1!
--
Eric Covener
covener@gmail.com
Re: svn commit: r1006125 - in /apr/apr-util/branches/0.9.x: libaprutil.dsp
xml/expat/lib/xml.dsp
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
On 10/9/2010 4:49 AM, wrowe@apache.org wrote:
> Author: wrowe
> Date: Sat Oct 9 09:49:24 2010
> New Revision: 1006125
>
> URL: http://svn.apache.org/viewvc?rev=1006125&view=rev
> Log:
> Catch up to 1.95.7 changes
I believe all is well from my test builds, so I think we are good to T&R :)
Thanks for the efforts to sync up expat, Ranier!