amassari 2004/02/12 10:43:37
Modified: c version.incl xerces-c.spec
c/src/xercesc/util/Platforms/Win32 Version.rc
c/Projects/Win32/VC6/xerces-all/XercesLib XercesLib.dsp
c/Projects/Win32/VC7/xerces-all/XercesLib XercesLib.vcproj
c/src/xercesc/util XercesVersion.hpp
Log:
Updated version to 2.5
Revision Changes Path
1.15 +3 -3 xml-xerces/c/version.incl
Index: version.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/version.incl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- version.incl 19 Nov 2003 22:59:23 -0000 1.14
+++ version.incl 12 Feb 2004 18:43:36 -0000 1.15
@@ -56,6 +56,6 @@
#
# $Id$
#
-VER=2_4_0
-SO_TARGET_VERSION=24
+VER=2_5_0
+SO_TARGET_VERSION=25
SO_TARGET_VERSION_MAJOR=0
1.6 +3 -3 xml-xerces/c/xerces-c.spec
Index: xerces-c.spec
===================================================================
RCS file: /home/cvs/xml-xerces/c/xerces-c.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xerces-c.spec 19 Nov 2003 22:59:23 -0000 1.5
+++ xerces-c.spec 12 Feb 2004 18:43:36 -0000 1.6
@@ -1,4 +1,4 @@
-%define tarversion 2_4_0
+%define tarversion 2_5_0
# threads
# values: pthreads, none
@@ -6,7 +6,7 @@
Summary: Xerces-C++ validating XML parser
Name: xerces-c
-Version: 2.4.0
+Version: 2.5.0
Release: 3
URL: http://xml.apache.org/xerces-c/
Source0: %{name}-src_%{tarversion}.tar.gz
@@ -67,7 +67,7 @@
export XERCESCROOT=$RPM_BUILD_DIR/%{name}-src_%{tarversion}
cd $XERCESCROOT/src/xercesc
make PREFIX=$RPM_BUILD_ROOT%{prefix} install
-ln -sf %{prefix}/lib/libxerces-c.so.24 $RPM_BUILD_ROOT%{prefix}/lib/libxerces-c.so
+ln -sf %{prefix}/lib/libxerces-c.so.25 $RPM_BUILD_ROOT%{prefix}/lib/libxerces-c.so
mkdir -p $RPM_BUILD_ROOT%{prefix}/bin
#we don't want obj directory
install `find $XERCESCROOT/bin -type f -maxdepth 1` $RPM_BUILD_ROOT%{prefix}/bin
1.47 +8 -8 xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc
Index: Version.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Version.rc 21 Nov 2003 11:36:55 -0000 1.46
+++ Version.rc 12 Feb 2004 18:43:36 -0000 1.47
@@ -29,8 +29,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,0,0
- PRODUCTVERSION 2,4,0,0
+ FILEVERSION 2,5,0,0
+ PRODUCTVERSION 2,5,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,15 +47,15 @@
BEGIN
VALUE "Comments", "Dynamic linked library for Xerces-C\0"
VALUE "CompanyName", "Apache Software Foundation\0"
- VALUE "FileDescription", "Shared Library for Xerces-C Version 2.4.0\0"
- VALUE "FileVersion", "2, 4, 0\0"
- VALUE "InternalName", "xerces-c_2_4_0.dll\0"
+ VALUE "FileDescription", "Shared Library for Xerces-C Version 2.5.0\0"
+ VALUE "FileVersion", "2, 5, 0\0"
+ VALUE "InternalName", "xerces-c_2_5_0.dll\0"
VALUE "LegalCopyright", "Copyright © Apache Software Foundation 2000
subject to licensing terms\0"
VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "xerces-c_2_4_0.dll\0"
+ VALUE "OriginalFilename", "xerces-c_2_5_0.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Xerces-C Version 2.4.0\0"
- VALUE "ProductVersion", "2, 4, 0\0"
+ VALUE "ProductName", "Xerces-C Version 2.5.0\0"
+ VALUE "ProductVersion", "2, 5, 0\0"
VALUE "SpecialBuild", "\0"
END
END
1.169 +5 -5
xml-xerces/c/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
Index: XercesLib.dsp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- XercesLib.dsp 16 Dec 2003 17:27:47 -0000 1.168
+++ XercesLib.dsp 12 Feb 2004 18:43:36 -0000 1.169
@@ -53,8 +53,8 @@
BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000"
/subsystem:windows /dll /map /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_4_0.dll"
/implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_2.lib" /version:2.4.0
-# SUBTRACT LINK32 /pdb:none /incremental:yes
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000"
/subsystem:windows /dll /map /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_5_0.dll"
/implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_2.lib" /version:2.5.0
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "XercesLib - Win32 Debug"
@@ -79,7 +79,7 @@
BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000"
/subsystem:windows /dll /debug /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2_4_0D.dll"
/implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept
/version:2.4.0
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000"
/subsystem:windows /dll /debug /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2_5_0D.dll"
/implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept
/version:2.5.0
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "XercesLib - Win64 Debug"
@@ -107,7 +107,7 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib
/base:"0x12000000" /subsystem:windows /dll /debug /machine:IX86
/out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_4_0D.dll"
/implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept
/version:2.4.0
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000"
/subsystem:windows /dll /debug /machine:IX86
/out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_4_0D.dll"
/implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept
/version:2.4.0 /machine:IA64
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000"
/subsystem:windows /dll /debug /machine:IX86
/out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_5_0D.dll"
/implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept
/version:2.5.0 /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "XercesLib - Win64 Release"
@@ -134,7 +134,7 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib
/base:"0x12000000" /subsystem:windows /dll /map /machine:IX86
/out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_4_0.dll"
/implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.4.0
# SUBTRACT BASE LINK32 /pdb:none /incremental:yes
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000"
/subsystem:windows /dll /incremental:yes /map /machine:IX86
/out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_4_0.dll"
/implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.4.0
/machine:IA64
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000"
/subsystem:windows /dll /incremental:yes /map /machine:IX86
/out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_5_0.dll"
/implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.5.0
/machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.39 +5 -5
xml-xerces/c/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj
Index: XercesLib.vcproj
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- XercesLib.vcproj 16 Dec 2003 18:00:31 -0000 1.38
+++ XercesLib.vcproj 12 Feb 2004 18:43:36 -0000 1.39
@@ -38,12 +38,12 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="ws2_32.lib"
-
OutputFile="..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_4_0.dll"
+
OutputFile="..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_5_0.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC7\Release"
-
ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2_4_0.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2_5_0.pdb"
GenerateMapFile="TRUE"
-
MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-c_2_4_0.map"
+
MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-c_2_5_0.map"
SubSystem="2"
BaseAddress="0x12000000"
ImportLibrary="..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2.lib"/>
@@ -94,11 +94,11 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="ws2_32.lib"
-
OutputFile="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_4_0D.dll"
+
OutputFile="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_5_0D.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC7\Debug"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_4_0D.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_5_0D.pdb"
SubSystem="2"
BaseAddress="0x12000000"
ImportLibrary="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2D.lib"/>
1.10 +1 -1 xml-xerces/c/src/xercesc/util/XercesVersion.hpp
Index: XercesVersion.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XercesVersion.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XercesVersion.hpp 13 Dec 2003 02:47:55 -0000 1.9
+++ XercesVersion.hpp 12 Feb 2004 18:43:37 -0000 1.10
@@ -162,7 +162,7 @@
*/
#define XERCES_VERSION_MAJOR 2
-#define XERCES_VERSION_MINOR 4
+#define XERCES_VERSION_MINOR 5
#define XERCES_VERSION_REVISION 0
#define XERCES_GRAMMAR_SERIALIZATION_LEVEL 1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
