apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r387762 - in /apr/apr-util/branches/0.9.x/xml/expat/lib: expat.dsp expat.h.in xml.dsp
Date Wed, 22 Mar 2006 06:57:56 GMT
Author: wrowe
Date: Tue Mar 21 22:57:54 2006
New Revision: 387762

URL: http://svn.apache.org/viewcvs?rev=387762&view=rev
Log:

  Solve the versioning problem the old fashioned way.  Clearly nobody's
  maintaining this branch, so hardcoding the current 5 year old version
  number in lib/expat.h.in shouldn't be a hardship, and hardcode the
  VERSION tag as moved around by automake'ish stuff into the .dsp's,
  the correct VERSION tag no less.

Backport 387759

Modified:
    apr/apr-util/branches/0.9.x/xml/expat/lib/expat.dsp
    apr/apr-util/branches/0.9.x/xml/expat/lib/expat.h.in
    apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dsp

Modified: apr/apr-util/branches/0.9.x/xml/expat/lib/expat.dsp
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/xml/expat/lib/expat.dsp?rev=387762&r1=387761&r2=387762&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/xml/expat/lib/expat.dsp (original)
+++ apr/apr-util/branches/0.9.x/xml/expat/lib/expat.dsp Tue Mar 21 22:57:54 2006
@@ -95,11 +95,11 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
-# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.1\"
+# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
@@ -110,11 +110,11 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
@@ -125,11 +125,11 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
@@ -140,12 +140,12 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
 # PROP Exclude_From_Build 1
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
@@ -156,12 +156,12 @@
 
 !IF  "$(CFG)" == "expat - Win32 Release"
 
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
 # PROP Exclude_From_Build 1
-# ADD CPP /D VERSION=\"expat_1.95.1\"
+# ADD CPP /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 

Modified: apr/apr-util/branches/0.9.x/xml/expat/lib/expat.h.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/xml/expat/lib/expat.h.in?rev=387762&r1=387761&r2=387762&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/xml/expat/lib/expat.h.in (original)
+++ apr/apr-util/branches/0.9.x/xml/expat/lib/expat.h.in Tue Mar 21 22:57:54 2006
@@ -726,13 +726,13 @@
 XML_ExpatVersionInfo(void);
 
 #ifndef XML_MAJOR_VERSION
-#define XML_MAJOR_VERSION @EXPAT_MAJOR_VERSION@
+#define XML_MAJOR_VERSION 1
 #endif
 #ifndef XML_MINOR_VERSION
-#define XML_MINOR_VERSION @EXPAT_MINOR_VERSION@
+#define XML_MINOR_VERSION 95
 #endif
 #ifndef XML_MICRO_VERSION
-#define XML_MICRO_VERSION @EXPAT_EDIT@
+#define XML_MICRO_VERSION 2
 #endif
 
 #ifdef __cplusplus

Modified: apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dsp
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/xml/expat/lib/xml.dsp?rev=387762&r1=387761&r2=387762&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 Tue Mar 21 22:57:54 2006
@@ -41,7 +41,7 @@
 # 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 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1
/Fd"LibR\xml_src" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D VERSION=\"expat_1.95.2\" /Fd"LibR\xml_src" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -65,7 +65,7 @@
 # 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.1\" /D XML_MAJOR_VERSION=1 /D XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1
/Fd"LibD\xml_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
/D VERSION=\"expat_1.95.2\" /Fd"LibD\xml_src" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe



Mime
View raw message