build xercesc2_4_0

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@175401 13f79535-47bb-0310-9956-ffa450edef68
PNjunctionShi · Nov 19, 2003 · 811051b · 811051b
1 parent 736da0e
commit 811051b
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 42 deletions.
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
@@ -39,7 +39,7 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_3_0.dll"
+ALL : "$(OUTDIR)\xerces-c_2_4_0.dll"
 
 
 CLEAN :
@@ -386,10 +386,10 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\obj\xerces-c_2_3_0.map"
+	-@erase "$(OUTDIR)\obj\xerces-c_2_4_0.map"
 	-@erase "$(OUTDIR)\xerces-c_2.exp"
 	-@erase "$(OUTDIR)\xerces-c_2.lib"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0.dll"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -436,7 +436,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_3_0.pdb" /map:"$(INTDIR)\xerces-c_2_3_0.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_2_3_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.3.0 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_4_0.pdb" /map:"$(INTDIR)\xerces-c_2_4_0.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_2_4_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.4.0 
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -781,7 +781,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMXPathException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_3_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_4_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -794,7 +794,7 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_3_0D.dll"
+ALL : "$(OUTDIR)\xerces-c_2_4_0D.dll"
 
 
 CLEAN :
@@ -1142,9 +1142,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0D.dll"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0D.ilk"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0D.pdb"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0D.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0D.ilk"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0D.pdb"
 	-@erase "$(OUTDIR)\xerces-c_2D.exp"
 	-@erase "$(OUTDIR)\xerces-c_2D.lib"
 
@@ -1193,7 +1193,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_3_0D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_2_3_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.3.0 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_4_0D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_2_4_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.4.0 
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -1538,7 +1538,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMXPathException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_3_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_4_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -1551,7 +1551,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_3_0D.dll"
+ALL : "$(OUTDIR)\xerces-c_2_4_0D.dll"
 
 
 CLEAN :
@@ -1899,9 +1899,9 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0D.dll"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0D.ilk"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0D.pdb"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0D.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0D.ilk"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0D.pdb"
 	-@erase "$(OUTDIR)\xerces-c_2D.exp"
 	-@erase "$(OUTDIR)\xerces-c_2D.lib"
 
@@ -1950,7 +1950,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_3_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_3_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.3.0 /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_4_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_4_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.4.0 /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -2295,7 +2295,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMXPathException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_3_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_4_0D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -2308,7 +2308,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release\obj
 OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
 # End Custom Macros
 
-ALL : "$(OUTDIR)\xerces-c_2_3_0.dll"
+ALL : "$(OUTDIR)\xerces-c_2_4_0.dll"
 
 
 CLEAN :
@@ -2655,11 +2655,11 @@ CLEAN :
 	-@erase "$(INTDIR)\XUtil.obj"
 	-@erase "$(INTDIR)\YearDatatypeValidator.obj"
 	-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
-	-@erase "$(OUTDIR)\obj\xerces-c_2_3_0.map"
+	-@erase "$(OUTDIR)\obj\xerces-c_2_4_0.map"
 	-@erase "$(OUTDIR)\xerces-c_2.exp"
 	-@erase "$(OUTDIR)\xerces-c_2.lib"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0.dll"
-	-@erase "$(OUTDIR)\xerces-c_2_3_0.ilk"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0.dll"
+	-@erase "$(OUTDIR)\xerces-c_2_4_0.ilk"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -2706,7 +2706,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc"
 BSC32_SBRS= \
 
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_3_0.pdb" /map:"$(INTDIR)\xerces-c_2_3_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_3_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.3.0 /machine:IA64 
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_4_0.pdb" /map:"$(INTDIR)\xerces-c_2_4_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_4_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.4.0 /machine:IA64 
 LINK32_OBJS= \
 	"$(INTDIR)\Win32PlatformUtils.obj" \
 	"$(INTDIR)\Win32MsgLoader.obj" \
@@ -3051,7 +3051,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\DOMXPathException.obj" \
 	"$(INTDIR)\Version.res"
 
-"$(OUTDIR)\xerces-c_2_3_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_4_0.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<

diff --git 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_3_0.dll"
+				OutputFile="..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_4_0.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC7\Release"
-				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2_3_0.pdb"
+				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2_4_0.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-c_2_3_0.map"
+				MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-c_2_4_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_3_0D.dll"
+				OutputFile="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_4_0D.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC7\Debug"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_3_0D.pdb"
+				ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_4_0D.pdb"
 				SubSystem="2"
 				BaseAddress="0x12000000"
 				ImportLibrary="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2D.lib"/>

diff --git a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
@@ -56,6 +56,9 @@
 
 /*
  * $Log$
+ * Revision 1.18  2003/11/19 23:08:02  peiyongz
+ * build xercesc2_4_0
+ *
  * Revision 1.17  2003/05/15 18:29:48  knoaman
  * Partial implementation of the configurable memory manager.
  *
@@ -171,7 +174,7 @@ XERCES_CPP_NAMESPACE_BEGIN
  */
 
 #if defined(_WIN32) || defined(WIN32)
-extern "C" void U_IMPORT *XercesMessages2_3_0_dat;
+extern "C" void U_IMPORT *XercesMessages2_4_0_dat;
 #else
 extern "C" void U_IMPORT *XercesMessages_dat;
 #endif
@@ -195,7 +198,7 @@ static void setAppData()
         setAppDataDone = true;
         UErrorCode err = U_ZERO_ERROR;
 #if defined(_WIN32) || defined(WIN32)
-        udata_setAppData("XercesMessages", &XercesMessages2_3_0_dat, &err);
+        udata_setAppData("XercesMessages", &XercesMessages2_4_0_dat, &err);
 #else
         udata_setAppData("XercesMessages", &XercesMessages_dat, &err);
 #endif        

diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp
@@ -157,7 +157,7 @@
  */
 
 #define XERCES_VERSION_MAJOR 2
-#define XERCES_VERSION_MINOR 3
+#define XERCES_VERSION_MINOR 4
 #define XERCES_VERSION_REVISION 0
 
 

diff --git a/version.incl b/version.incl
@@ -56,6 +56,6 @@
 #
 # $Id$
 #
-VER=2_3_0
-SO_TARGET_VERSION=23
+VER=2_4_0
+SO_TARGET_VERSION=24
 SO_TARGET_VERSION_MAJOR=0
diff --git a/xerces-c.spec b/xerces-c.spec
@@ -1,12 +1,12 @@
-%define tarversion 2_3_0
+%define tarversion 2_4_0
 
 # threads
 # values: pthreads, none
 %define threads pthreads
 
 Summary:	Xerces-C++ validating XML parser
 Name:		xerces-c
-Version:	2.3.0
+Version:	2.4.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.23 $RPM_BUILD_ROOT%{prefix}/lib/libxerces-c.so
+ln -sf %{prefix}/lib/libxerces-c.so.24 $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