diff --git a/doc/style/dtd/entities.ent b/doc/style/dtd/entities.ent
index f79ca41cd6f87d37f0c4aa8a97022945951cceb7..cc262e751e236f80cbd577b424946eb90131ea78 100644
--- a/doc/style/dtd/entities.ent
+++ b/doc/style/dtd/entities.ent
@@ -2,15 +2,15 @@
<!ENTITY XercesCFullName "Xerces C++ Parser"> <!-- fullproductname -->
<!ENTITY XercesCName "Xerces-C++"> <!-- productname -->
-<!ENTITY XercesCVersion "2.0.0"> <!-- versionnumber -->
+<!ENTITY XercesCVersion "2.1.0"> <!-- versionnumber -->
<!ENTITY XercesCVersion152 "1.5.2"> <!-- versionnumber -->
<!ENTITY XercesCProjectName "Xerces"> <!-- projectname -->
-<!ENTITY XercesCInstallDir "xerces-c2_0_0"> <!-- installdirname -->
-<!ENTITY XercesCSrcInstallDir "xerces-c-src2_0_0"> <!-- sourcedirectory -->
+<!ENTITY XercesCInstallDir "xerces-c2_1_0"> <!-- installdirname -->
+<!ENTITY XercesCSrcInstallDir "xerces-c-src2_1_0"> <!-- sourcedirectory -->
<!ENTITY XercesCWindowsLib "xerces-c_2"> <!-- windowslibname -->
-<!ENTITY XercesCWindowsDLL "xerces-c_2_0_0"> <!-- windowsDLLname -->
-<!ENTITY XercesCUnixSoName "20.0"> <!-- unixlibname -->
-<!ENTITY XercesCUnixVersion "20"> <!-- unixlibname -->
+<!ENTITY XercesCWindowsDLL "xerces-c_2_1_0"> <!-- windowsDLLname -->
+<!ENTITY XercesCUnixSoName "21.0"> <!-- unixlibname -->
+<!ENTITY XercesCUnixVersion "21"> <!-- unixlibname -->
<!ENTITY XercesCUnixLib "libxerces-c"> <!-- unixlibname -->
<!ENTITY XercesCEmailAddress "xerces-c-dev@xml.apache.org "> <!-- emailaddress -->
<!ENTITY XercesDistDir "xml.apache.org/dist/xerces-c"> <!-- download directory -->
diff --git a/scripts/packageBinaries.pl b/scripts/packageBinaries.pl
index 3b94f5d9d02eaec44d2165b8ee8b1a5321c9d4b4..d36b4c7a04a5c6c3018ed815025e2a96711b4768 100644
--- a/scripts/packageBinaries.pl
+++ b/scripts/packageBinaries.pl
@@ -29,11 +29,11 @@ if (!length($XERCESCROOT) || !length($targetdir) || (length($opt_h) > 0) ) {
print (" -j suppress building of ICU (speeds up builds when debugging)\n");
print (" -h to get help on these commands\n\n");
print ("Example: Under unix's\n");
- print (" perl packageBinaries.pl -s \$HOME/xerces-c-src2_0_0");
- print (" -o \$HOME/xerces-c_2_0_0-linux -c gcc -x g++ -m inmem -n fileonly -t native\n\n");
+ print (" perl packageBinaries.pl -s \$HOME/xerces-c-src2_1_0");
+ print (" -o \$HOME/xerces-c_2_1_0-linux -c gcc -x g++ -m inmem -n fileonly -t native\n\n");
print ("Example: Under Windows\n");
- print (" perl packageBinaries.pl -s \\xerces-c-src2_0_0");
- print (" -o\\xerces-c_2_0_0-win32 [-n fileonly] [-t icu]\n\n");
+ print (" perl packageBinaries.pl -s \\xerces-c-src2_1_0");
+ print (" -o\\xerces-c_2_1_0-win32 [-n fileonly] [-t icu]\n\n");
print ("Note:\n");
print (" Under Windows, by default the XercesLib project files is\n");
print (" configured to use Win32 resource file based message loader,\n");
@@ -166,9 +166,9 @@ if ($platform eq "" )
pchdir ("$ICUROOT\\source\\allinone\\all");
if (!(length($opt_j) > 0)) { # Optionally suppress ICU build, to speed up overlong builds while debugging.
#For XP we ship both release and debug dlls
- psystem("nmake -f all_win64_release.mak \"CFG=all - $platformname Release\" CPP=$opt_x.exe >buildlog.txt 2>&1");
+ psystem("nmake -f all_win64_release.mak \"CFG=all - $platformname Release\" CPP=$opt_x.exe >buildlog.txt 2>&1");
psystem("type buildlog.txt");
- psystem("nmake -f all_win64_debug.mak \"CFG=all - $platformname Debug\" CPP=$opt_x.exe >buildlog.txt 2>&1");
+ psystem("nmake -f all_win64_debug.mak \"CFG=all - $platformname Debug\" CPP=$opt_x.exe >buildlog.txt 2>&1");
psystem("type buildlog.txt");
}
@@ -1040,22 +1040,22 @@ if ( ($platform =~ m/AIX/i) || ($platform =~ m/HP-UX/i) ||
pchdir ("$targetdir/lib");
psystem("rm -f libxerces-c* ");
- if ((-e "$XERCESCROOT/lib/libxerces-c.so.20.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c.so.20.0 .");
- psystem("ln -s libxerces-c.so.20.0 libxerces-c.so.20 ");
- psystem("ln -s libxerces-c.so.20 libxerces-c.so ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c.so.21.0" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c.so.21.0 .");
+ psystem("ln -s libxerces-c.so.21.0 libxerces-c.so.21 ");
+ psystem("ln -s libxerces-c.so.21 libxerces-c.so ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-c.sl.20.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c.sl.20.0 .");
- psystem("ln -s libxerces-c.sl.20.0 libxerces-c.sl.20 ");
- psystem("ln -s libxerces-c.sl.20 libxerces-c.sl ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c.sl.21.0" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c.sl.21.0 .");
+ psystem("ln -s libxerces-c.sl.21.0 libxerces-c.sl.21 ");
+ psystem("ln -s libxerces-c.sl.21 libxerces-c.sl ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-c20.0.so" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c20.0.so .");
- psystem("ln -s libxerces-c20.0.so libxerces-c20.so ");
- psystem("ln -s libxerces-c20.so libxerces-c.so ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c21.0.so" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c21.0.so .");
+ psystem("ln -s libxerces-c21.0.so libxerces-c21.so ");
+ psystem("ln -s libxerces-c21.so libxerces-c.so ");
}
#
@@ -1224,7 +1224,7 @@ sub change_windows_project_for_ICU() {
$line =~ s/user32.lib/user32.lib $icuuc.lib icudata.lib/g;
$line =~ s/Transcoders\\Win32\\Win32TransService.cpp/Transcoders\\ICU\\ICUTransService.cpp/g;
$line =~ s/Transcoders\\Win32\\Win32TransService.hpp/Transcoders\\ICU\\ICUTransService.hpp/g;
-
+
print FIZZLEOUT $line;
}
close (FIZZLEOUT);
@@ -1248,7 +1248,7 @@ sub change_windows_makefile_for_ICU() {
$icuuc = "icuuc";
}
- $line =~ s[/D "PROJ_XMLPARSER"][/I "$ICUROOT\\include" /D "PROJ_XMLPARSER"];
+ $line =~ s[/D "PROJ_XMLPARSER"][/I "$ICUROOT\\include" /D "PROJ_XMLPARSER"];
#$line =~ s[/implib:"\$(OUTDIR)\\xerces-c_2.lib"][/implib:"\$(OUTDIR)\\xerces-c_2.lib" /libpath:"$ICUROOT\\lib" /libpath:"$ICUROOT\\source\\data"];
#$line =~ s[/implib:"\$(OUTDIR)\\xerces-c_2D.lib"][/implib:"\$(OUTDIR)\\xerces-c_2D.lib" /libpath:"$ICUROOT\\lib" /libpath:"$ICUROOT\\source\\data"];
$line =~ s[/machine:IA64][/libpath:"$ICUROOT\\lib" /libpath:"$ICUROOT\\source\\data" /machine:IA64];
diff --git a/src/xercesc/com/xml4com.idl b/src/xercesc/com/xml4com.idl
index 2601be581e644cf65dd86d8ea4c639d56efd6867..6b277e79479032f1f63e089f7049d847d274deae 100644
--- a/src/xercesc/com/xml4com.idl
+++ b/src/xercesc/com/xml4com.idl
@@ -69,8 +69,8 @@ import "oaidl.idl";
// Format for version is major.minor
// no support for additional parts (like 1.5.2)
// Use 1.60 for subsequent release
- version(2.00),
- helpstring("Xerces XML Parser 2.0.0")
+ version(2.10),
+ helpstring("Xerces XML Parser 2.1.0")
]
library Xerces
{
diff --git a/src/xercesc/configure.in b/src/xercesc/configure.in
index 0fc858ef070207323a2e2c46e09b6373541e0a4e..8e4a4cf00a62900542c6569a99e6e9f76715e2d9 100644
--- a/src/xercesc/configure.in
+++ b/src/xercesc/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script
AC_INIT(util/XercesDefs.hpp)
dnl AC_CONFIG_HEADER(common/icucfg.h)
-dnl AM_INIT_AUTOMAKE(xerces-c,2.0.0)
+dnl AM_INIT_AUTOMAKE(xerces-c,2.1.0)
dnl Checks for programs
AC_PROG_CC
AC_PROG_CXX
diff --git a/src/xercesc/util/Platforms/Win32/Version.rc b/src/xercesc/util/Platforms/Win32/Version.rc
index 3c85fb95776c1a04ed1dd2214b81f30fbac3ebc0..c4e2e1d1a7187f49f4ecd1d6555af1993738c2b6 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,0,0,0
- PRODUCTVERSION 2,0,0,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,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.0.0\0"
- VALUE "FileVersion", "2, 0, 0\0"
- VALUE "InternalName", "xerces-c_2_0_0.dll\0"
+ VALUE "FileDescription", "Shared Library for Xerces-C Version 2.1.0\0"
+ VALUE "FileVersion", "2, 1, 0\0"
+ VALUE "InternalName", "xerces-c_2_1_0.dll\0"
VALUE "LegalCopyright", "Copyright © Apache Software Foundation 2000 subject to licensing terms\0"
VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "xerces-c_2_0_0.dll\0"
+ VALUE "OriginalFilename", "xerces-c_2_1_0.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Xerces-C Version 2.0.0\0"
- VALUE "ProductVersion", "2, 0, 0\0"
+ VALUE "ProductName", "Xerces-C Version 2.1.0\0"
+ VALUE "ProductVersion", "2, 1, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp
index c2b89317ea6dbd0a3f297a5019114d057f913999..5205ea04f4ec48306142f3f2024d50c3270b5090 100644
--- a/src/xercesc/util/XercesVersion.hpp
+++ b/src/xercesc/util/XercesVersion.hpp
@@ -63,13 +63,13 @@
/**
* User Documentation for Xerces Version Values:
*
- *
+ *
*
* Xerces Notes:
*
* Xerces Committers Documentation:
*
- * Xerces committers normally only need to modify one or two of the
+ * Xerces committers normally only need to modify one or two of the
* following macros:
*
* XERCES_VERSION_MAJOR
@@ -99,7 +99,7 @@
*
* _XERCES_VERSION defines the primary preprocessor macro that users will
* introduce into their code to perform conditional compilation where the
- * version of Xerces is detected in order to enable or disable version
+ * version of Xerces is detected in order to enable or disable version
* specific capabilities. The value of _XERCES_VERSION for the above example
* will be 190374. To use it a user would perform an operation such as the
* following:
@@ -117,7 +117,7 @@
* constant whose value, for the above example, will be "19.3.74".
*
* XERCES_VERSIONSTR is a preprocessor macro that expands to a string
- * constant whose value, for the above example, will be "19374". This
+ * constant whose value, for the above example, will be "19374". This
* particular macro is very dangerous if it were to be used for comparing
* version numbers since ordering will not be guaranteed.
*
@@ -132,7 +132,7 @@
* the value "19_3" for the above example.
*
* gXercesFullVersionStr is a global string constant whose value corresponds
- * to the value "19_3_74" for the above example.
+ * to the value "19_3_74" for the above example.
*
* Numeric Constants:
*
@@ -157,7 +157,7 @@
*/
#define XERCES_VERSION_MAJOR 2
-#define XERCES_VERSION_MINOR 0
+#define XERCES_VERSION_MINOR 1
#define XERCES_VERSION_REVISION 0
diff --git a/version.incl b/version.incl
index 8f8bf15e420b9ef3e31a5e597443b25a90891977..771308542d5b5e2e6fb8102cd4362781e8b2cffd 100644
--- a/version.incl
+++ b/version.incl
@@ -56,6 +56,6 @@
#
# $Id$
#
-VER=2_0_0
-SO_TARGET_VERSION=20
+VER=2_1_0
+SO_TARGET_VERSION=21
SO_TARGET_VERSION_MAJOR=0