Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 16590 invoked from network); 22 Mar 2006 06:55:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Mar 2006 06:55:32 -0000 Received: (qmail 22413 invoked by uid 500); 22 Mar 2006 06:55:29 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 22362 invoked by uid 500); 22 Mar 2006 06:55:29 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 22350 invoked by uid 99); 22 Mar 2006 06:55:29 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Mar 2006 22:55:29 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 21 Mar 2006 22:55:28 -0800 Received: (qmail 16177 invoked by uid 65534); 22 Mar 2006 06:55:07 -0000 Message-ID: <20060322065507.16176.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r387761 - in /apr/apr-util/branches/1.2.x/xml/expat/lib: expat.dsp expat.h.in xml.dsp Date: Wed, 22 Mar 2006 06:55:06 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: wrowe Date: Tue Mar 21 22:55:04 2006 New Revision: 387761 URL: http://svn.apache.org/viewcvs?rev=387761&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/1.2.x/xml/expat/lib/expat.dsp apr/apr-util/branches/1.2.x/xml/expat/lib/expat.h.in apr/apr-util/branches/1.2.x/xml/expat/lib/xml.dsp Modified: apr/apr-util/branches/1.2.x/xml/expat/lib/expat.dsp URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/xml/expat/lib/expat.dsp?rev=387761&r1=387760&r2=387761&view=diff ============================================================================== --- apr/apr-util/branches/1.2.x/xml/expat/lib/expat.dsp (original) +++ apr/apr-util/branches/1.2.x/xml/expat/lib/expat.dsp Tue Mar 21 22:55:04 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/1.2.x/xml/expat/lib/expat.h.in URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/xml/expat/lib/expat.h.in?rev=387761&r1=387760&r2=387761&view=diff ============================================================================== --- apr/apr-util/branches/1.2.x/xml/expat/lib/expat.h.in (original) +++ apr/apr-util/branches/1.2.x/xml/expat/lib/expat.h.in Tue Mar 21 22:55:04 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/1.2.x/xml/expat/lib/xml.dsp URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/xml/expat/lib/xml.dsp?rev=387761&r1=387760&r2=387761&view=diff ============================================================================== --- apr/apr-util/branches/1.2.x/xml/expat/lib/xml.dsp (original) +++ apr/apr-util/branches/1.2.x/xml/expat/lib/xml.dsp Tue Mar 21 22:55:04 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 /O2 /Oy- /Zi /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