From 967414d433b542d8fdb860d1d3168af27c476946 Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Thu, 12 Feb 2004 18:43:37 +0000
Subject: [PATCH] Updated version to 2.5
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@175756 13f79535-47bb-0310-9956-ffa450edef68
---
.../Win32/VC6/xerces-all/XercesLib/XercesLib.dsp | 10 +++++-----
.../VC7/xerces-all/XercesLib/XercesLib.vcproj | 10 +++++-----
src/xercesc/util/Platforms/Win32/Version.rc | 16 ++++++++--------
src/xercesc/util/XercesVersion.hpp | 2 +-
version.incl | 4 ++--
xerces-c.spec | 6 +++---
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
index 1de9adef7..a0efd4bf1 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
@@ -53,8 +53,8 @@ RSC=rc.exe
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 @@ LINK32=link.exe
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 @@ BSC32=bscmake.exe
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 @@ BSC32=bscmake.exe
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
diff --git a/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj
index 6f8ccd5ca..210ba19bb 100644
--- a/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj
@@ -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"/>
diff --git a/src/xercesc/util/Platforms/Win32/Version.rc b/src/xercesc/util/Platforms/Win32/Version.rc
index 134f7d429..50f590103 100644
--- a/src/xercesc/util/Platforms/Win32/Version.rc
+++ b/src/xercesc/util/Platforms/Win32/Version.rc
@@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
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
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
diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp
index 9b78c2f84..34879fea8 100644
--- a/src/xercesc/util/XercesVersion.hpp
+++ b/src/xercesc/util/XercesVersion.hpp
@@ -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
diff --git a/version.incl b/version.incl
index a4dabb356..00d497042 100644
--- a/version.incl
+++ b/version.incl
@@ -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
diff --git a/xerces-c.spec b/xerces-c.spec
index 7384fd1b4..812a51b15 100644
--- a/xerces-c.spec
+++ b/xerces-c.spec
@@ -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 @@ make
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
--
GitLab