diff --git a/Projects/MacOS/ProjectBuilder/XercesLib/English.lproj/InfoPlist.strings b/Projects/MacOS/ProjectBuilder/XercesLib/English.lproj/InfoPlist.strings
index 0553fad7db1d288b6c822c43f90b505fa0fba46b..045325191b93b04a8782002a6055423cff3a99ac 100644
--- a/Projects/MacOS/ProjectBuilder/XercesLib/English.lproj/InfoPlist.strings
+++ b/Projects/MacOS/ProjectBuilder/XercesLib/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Xerces";
-CFBundleShortVersionString = "XercesLib version 2.4.0";
-CFBundleGetInfoString = "XercesLib version 2.4.0";
+CFBundleShortVersionString = "XercesLib version 2.6.0";
+CFBundleGetInfoString = "XercesLib version 2.6.0";
NSHumanReadableCopyright = "Copyright";
diff --git a/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj b/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj
index c3535b51c6074adb2fdaca3d72dae236992a7ac9..b324272ff28621a47ba54529ef3a4f2f6a05e8d5 100644
--- a/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj
+++ b/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj
@@ -2990,7 +2990,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.4.0</string>
+ <string>2.6.0</string>
</dict>
</plist>
";
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.dsp
index 9c42f9e69aa92b39cd05740ee7adbbf70d022add..e8357152e777ca598c1cf91625174879664aef7c 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.dsp
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.dsp
@@ -54,7 +54,7 @@ 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 xerces-c_2.lib /base:"0x12000000" /subsystem:windows /dll /map /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-depdom_2_5.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-depdom_2.lib" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2.lib /base:"0x12000000" /subsystem:windows /dll /map /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-depdom_2_6.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-depdom_2.lib" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
# SUBTRACT LINK32 /pdb:none /incremental:yes
!ELSEIF "$(CFG)" == "XercesDeprecatedDOMLib - Win32 Debug"
@@ -80,7 +80,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 xerces-c_2D.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-depdom_2_5D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-depdom_2D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2D.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-depdom_2_6D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-depdom_2D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "XercesDeprecatedDOMLib - Win64 Debug"
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2D.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-depdom_2_5D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-depdom_2D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2D.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-depdom_2_6D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-depdom_2D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "XercesDeprecatedDOMLib - Win64 Release"
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
# SUBTRACT BASE LINK32 /pdb:none /incremental:yes
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /map /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-depdom_2_5.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-depdom_2.lib" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /map /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-depdom_2_6.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-depdom_2.lib" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.mak b/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.mak
index 526bfb41051227d448c6b94051a170408068a1cc..d2e9fb037de5062f3041d1793657632ef2b87a5e 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.mak
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.mak
@@ -37,11 +37,11 @@ OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\xerces-depdom_2_5.dll"
+ALL : "$(OUTDIR)\xerces-depdom_2_6.dll"
!ELSE
-ALL : "XercesLib - Win32 Release" "$(OUTDIR)\xerces-depdom_2_5.dll"
+ALL : "XercesLib - Win32 Release" "$(OUTDIR)\xerces-depdom_2_6.dll"
!ENDIF
@@ -109,10 +109,10 @@ CLEAN :
-@erase "$(INTDIR)\TreeWalkerImpl.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\XMLDeclImpl.obj"
- -@erase "$(OUTDIR)\obj\xerces-depdom_2_5.map"
+ -@erase "$(OUTDIR)\obj\xerces-depdom_2_6.map"
-@erase "$(OUTDIR)\xerces-depdom_2.exp"
-@erase "$(OUTDIR)\xerces-depdom_2.lib"
- -@erase "$(OUTDIR)\xerces-depdom_2_5.dll"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6.dll"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -161,7 +161,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesDeprecatedDOMLib.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-depdom_2_5.pdb" /map:"$(INTDIR)\xerces-depdom_2_5.map" /machine:I386 /out:"$(OUTDIR)\xerces-depdom_2_5.dll" /implib:"$(OUTDIR)\xerces-depdom_2.lib" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-depdom_2_6.pdb" /map:"$(INTDIR)\xerces-depdom_2_6.map" /machine:I386 /out:"$(OUTDIR)\xerces-depdom_2_6.dll" /implib:"$(OUTDIR)\xerces-depdom_2.lib" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
LINK32_OBJS= \
"$(INTDIR)\AttrImpl.obj" \
"$(INTDIR)\AttrMapImpl.obj" \
@@ -223,7 +223,7 @@ LINK32_OBJS= \
"$(INTDIR)\XMLDeclImpl.obj" \
"$(OUTDIR)\xerces-c_2.lib"
-"$(OUTDIR)\xerces-depdom_2_5.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-depdom_2_6.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -238,11 +238,11 @@ OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\xerces-depdom_2_5D.dll"
+ALL : "$(OUTDIR)\xerces-depdom_2_6D.dll"
!ELSE
-ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\xerces-depdom_2_5D.dll"
+ALL : "XercesLib - Win32 Debug" "$(OUTDIR)\xerces-depdom_2_6D.dll"
!ENDIF
@@ -311,9 +311,9 @@ CLEAN :
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
-@erase "$(INTDIR)\XMLDeclImpl.obj"
- -@erase "$(OUTDIR)\xerces-depdom_2_5D.dll"
- -@erase "$(OUTDIR)\xerces-depdom_2_5D.ilk"
- -@erase "$(OUTDIR)\xerces-depdom_2_5D.pdb"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6D.dll"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6D.ilk"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6D.pdb"
-@erase "$(OUTDIR)\xerces-depdom_2D.exp"
-@erase "$(OUTDIR)\xerces-depdom_2D.lib"
@@ -364,7 +364,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesDeprecatedDOMLib.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2D.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-depdom_2_5D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-depdom_2_5D.dll" /implib:"$(OUTDIR)\xerces-depdom_2D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2D.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-depdom_2_6D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-depdom_2_6D.dll" /implib:"$(OUTDIR)\xerces-depdom_2D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
LINK32_OBJS= \
"$(INTDIR)\AttrImpl.obj" \
"$(INTDIR)\AttrMapImpl.obj" \
@@ -426,7 +426,7 @@ LINK32_OBJS= \
"$(INTDIR)\XMLDeclImpl.obj" \
"$(OUTDIR)\xerces-c_2D.lib"
-"$(OUTDIR)\xerces-depdom_2_5D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-depdom_2_6D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -441,11 +441,11 @@ OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\xerces-depdom_2_5D.dll"
+ALL : "$(OUTDIR)\xerces-depdom_2_6D.dll"
!ELSE
-ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\xerces-depdom_2_5D.dll"
+ALL : "XercesLib - Win64 Debug" "$(OUTDIR)\xerces-depdom_2_6D.dll"
!ENDIF
@@ -514,9 +514,9 @@ CLEAN :
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
-@erase "$(INTDIR)\XMLDeclImpl.obj"
- -@erase "$(OUTDIR)\xerces-depdom_2_5D.dll"
- -@erase "$(OUTDIR)\xerces-depdom_2_5D.ilk"
- -@erase "$(OUTDIR)\xerces-depdom_2_5D.pdb"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6D.dll"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6D.ilk"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6D.pdb"
-@erase "$(OUTDIR)\xerces-depdom_2D.exp"
-@erase "$(OUTDIR)\xerces-depdom_2D.lib"
@@ -567,7 +567,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesDeprecatedDOMLib.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2D.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-depdom_2_5D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-depdom_2_5D.dll" /implib:"$(OUTDIR)\xerces-depdom_2D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2D.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-depdom_2_6D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-depdom_2_6D.dll" /implib:"$(OUTDIR)\xerces-depdom_2D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\AttrImpl.obj" \
"$(INTDIR)\AttrMapImpl.obj" \
@@ -629,7 +629,7 @@ LINK32_OBJS= \
"$(INTDIR)\XMLDeclImpl.obj" \
"$(OUTDIR)\xerces-c_2D.lib"
-"$(OUTDIR)\xerces-depdom_2_5D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-depdom_2_6D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -644,11 +644,11 @@ OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\xerces-depdom_2_5.dll"
+ALL : "$(OUTDIR)\xerces-depdom_2_6.dll"
!ELSE
-ALL : "XercesLib - Win64 Release" "$(OUTDIR)\xerces-depdom_2_5.dll"
+ALL : "XercesLib - Win64 Release" "$(OUTDIR)\xerces-depdom_2_6.dll"
!ENDIF
@@ -716,11 +716,11 @@ CLEAN :
-@erase "$(INTDIR)\TreeWalkerImpl.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\XMLDeclImpl.obj"
- -@erase "$(OUTDIR)\obj\xerces-depdom_2_5.map"
+ -@erase "$(OUTDIR)\obj\xerces-depdom_2_6.map"
-@erase "$(OUTDIR)\xerces-depdom_2.exp"
-@erase "$(OUTDIR)\xerces-depdom_2.lib"
- -@erase "$(OUTDIR)\xerces-depdom_2_5.dll"
- -@erase "$(OUTDIR)\xerces-depdom_2_5.ilk"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6.dll"
+ -@erase "$(OUTDIR)\xerces-depdom_2_6.ilk"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -769,7 +769,7 @@ BSC32_FLAGS=/o"$(OUTDIR)\XercesDeprecatedDOMLib.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-depdom_2_5.pdb" /map:"$(INTDIR)\xerces-depdom_2_5.map" /machine:IX86 /out:"$(OUTDIR)\xerces-depdom_2_5.dll" /implib:"$(OUTDIR)\xerces-depdom_2.lib" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib xerces-c_2.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-depdom_2_6.pdb" /map:"$(INTDIR)\xerces-depdom_2_6.map" /machine:IX86 /out:"$(OUTDIR)\xerces-depdom_2_6.dll" /implib:"$(OUTDIR)\xerces-depdom_2.lib" /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\AttrImpl.obj" \
"$(INTDIR)\AttrMapImpl.obj" \
@@ -831,7 +831,7 @@ LINK32_OBJS= \
"$(INTDIR)\XMLDeclImpl.obj" \
"$(OUTDIR)\xerces-c_2.lib"
-"$(OUTDIR)\xerces-depdom_2_5.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-depdom_2_6.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
index a1bc3d3b4ce4e62263b4ace1d4314eb9d6bac39a..45b91e94b75eba4d7b0e3778d73998b55c88862b 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
@@ -54,7 +54,7 @@ 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_5.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_2.lib" /version:2.5.0
+# 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_6.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_2.lib" /version:2.6.0
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "XercesLib - Win32 Debug"
@@ -80,7 +80,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_5D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.5.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_6D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.6.0
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "XercesLib - Win64 Debug"
@@ -108,7 +108,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_5D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.5.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_6D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.6.0 /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "XercesLib - Win64 Release"
@@ -135,7 +135,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_5.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.5.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_6.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.6.0 /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
index 4f691807f3ac05aeddbf8a96c581e3283beff81c..1080e3948f7046d9439670fe15f5480dd2eeb0e2 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak
@@ -35,7 +35,7 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Release\obj
OutDir=.\..\..\..\..\..\Build\Win32\VC6\Release
# End Custom Macros
-ALL : "$(OUTDIR)\xerces-c_2_5.dll"
+ALL : "$(OUTDIR)\xerces-c_2_6.dll"
CLEAN :
@@ -332,10 +332,10 @@ CLEAN :
-@erase "$(INTDIR)\XUtil.obj"
-@erase "$(INTDIR)\YearDatatypeValidator.obj"
-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
- -@erase "$(OUTDIR)\obj\xerces-c_2_5.map"
+ -@erase "$(OUTDIR)\obj\xerces-c_2_6.map"
-@erase "$(OUTDIR)\xerces-c_2.exp"
-@erase "$(OUTDIR)\xerces-c_2.lib"
- -@erase "$(OUTDIR)\xerces-c_2_5.dll"
+ -@erase "$(OUTDIR)\xerces-c_2_6.dll"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -385,7 +385,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_5.pdb" /map:"$(INTDIR)\xerces-c_2_5.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_2_5.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.5.0
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_6.pdb" /map:"$(INTDIR)\xerces-c_2_6.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_2_6.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.6.0
LINK32_OBJS= \
"$(INTDIR)\Win32PlatformUtils.obj" \
"$(INTDIR)\Win32MsgLoader.obj" \
@@ -680,7 +680,7 @@ LINK32_OBJS= \
"$(INTDIR)\DOMXPathException.obj" \
"$(INTDIR)\Version.res"
-"$(OUTDIR)\xerces-c_2_5.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_6.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -693,7 +693,7 @@ INTDIR=.\..\..\..\..\..\Build\Win32\VC6\Debug\obj
OutDir=.\..\..\..\..\..\Build\Win32\VC6\Debug
# End Custom Macros
-ALL : "$(OUTDIR)\xerces-c_2_5D.dll"
+ALL : "$(OUTDIR)\xerces-c_2_6D.dll"
CLEAN :
@@ -991,9 +991,9 @@ CLEAN :
-@erase "$(INTDIR)\XUtil.obj"
-@erase "$(INTDIR)\YearDatatypeValidator.obj"
-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
- -@erase "$(OUTDIR)\xerces-c_2_5D.dll"
- -@erase "$(OUTDIR)\xerces-c_2_5D.ilk"
- -@erase "$(OUTDIR)\xerces-c_2_5D.pdb"
+ -@erase "$(OUTDIR)\xerces-c_2_6D.dll"
+ -@erase "$(OUTDIR)\xerces-c_2_6D.ilk"
+ -@erase "$(OUTDIR)\xerces-c_2_6D.pdb"
-@erase "$(OUTDIR)\xerces-c_2D.exp"
-@erase "$(OUTDIR)\xerces-c_2D.lib"
@@ -1045,7 +1045,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_5D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_2_5D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.5.0
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_6D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_2_6D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.6.0
LINK32_OBJS= \
"$(INTDIR)\Win32PlatformUtils.obj" \
"$(INTDIR)\Win32MsgLoader.obj" \
@@ -1340,7 +1340,7 @@ LINK32_OBJS= \
"$(INTDIR)\DOMXPathException.obj" \
"$(INTDIR)\Version.res"
-"$(OUTDIR)\xerces-c_2_5D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_6D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -1353,7 +1353,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Debug\obj
OutDir=.\..\..\..\..\..\Build\Win64\VC6\Debug
# End Custom Macros
-ALL : "$(OUTDIR)\xerces-c_2_5D.dll"
+ALL : "$(OUTDIR)\xerces-c_2_6D.dll"
CLEAN :
@@ -1651,9 +1651,9 @@ CLEAN :
-@erase "$(INTDIR)\XUtil.obj"
-@erase "$(INTDIR)\YearDatatypeValidator.obj"
-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
- -@erase "$(OUTDIR)\xerces-c_2_5D.dll"
- -@erase "$(OUTDIR)\xerces-c_2_5D.ilk"
- -@erase "$(OUTDIR)\xerces-c_2_5D.pdb"
+ -@erase "$(OUTDIR)\xerces-c_2_6D.dll"
+ -@erase "$(OUTDIR)\xerces-c_2_6D.ilk"
+ -@erase "$(OUTDIR)\xerces-c_2_6D.pdb"
-@erase "$(OUTDIR)\xerces-c_2D.exp"
-@erase "$(OUTDIR)\xerces-c_2D.lib"
@@ -1705,7 +1705,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_5D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_5D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.5.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_6D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_6D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.6.0 /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\Win32PlatformUtils.obj" \
"$(INTDIR)\Win32MsgLoader.obj" \
@@ -2000,7 +2000,7 @@ LINK32_OBJS= \
"$(INTDIR)\DOMXPathException.obj" \
"$(INTDIR)\Version.res"
-"$(OUTDIR)\xerces-c_2_5D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_6D.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -2013,7 +2013,7 @@ INTDIR=.\..\..\..\..\..\Build\Win64\VC6\Release\obj
OutDir=.\..\..\..\..\..\Build\Win64\VC6\Release
# End Custom Macros
-ALL : "$(OUTDIR)\xerces-c_2_5.dll"
+ALL : "$(OUTDIR)\xerces-c_2_6.dll"
CLEAN :
@@ -2310,11 +2310,11 @@ CLEAN :
-@erase "$(INTDIR)\XUtil.obj"
-@erase "$(INTDIR)\YearDatatypeValidator.obj"
-@erase "$(INTDIR)\YearMonthDatatypeValidator.obj"
- -@erase "$(OUTDIR)\obj\xerces-c_2_5.map"
+ -@erase "$(OUTDIR)\obj\xerces-c_2_6.map"
-@erase "$(OUTDIR)\xerces-c_2.exp"
-@erase "$(OUTDIR)\xerces-c_2.lib"
- -@erase "$(OUTDIR)\xerces-c_2_5.dll"
- -@erase "$(OUTDIR)\xerces-c_2_5.ilk"
+ -@erase "$(OUTDIR)\xerces-c_2_6.dll"
+ -@erase "$(OUTDIR)\xerces-c_2_6.ilk"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -2364,7 +2364,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_5.pdb" /map:"$(INTDIR)\xerces-c_2_5.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_5.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.5.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_6.pdb" /map:"$(INTDIR)\xerces-c_2_6.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_6.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.6.0 /machine:IA64
LINK32_OBJS= \
"$(INTDIR)\Win32PlatformUtils.obj" \
"$(INTDIR)\Win32MsgLoader.obj" \
@@ -2659,7 +2659,7 @@ LINK32_OBJS= \
"$(INTDIR)\DOMXPathException.obj" \
"$(INTDIR)\Version.res"
-"$(OUTDIR)\xerces-c_2_5.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\xerces-c_2_6.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
diff --git a/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp b/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
index 8d286fecd75a86b47b63f159accc397b906dbf0f..d9ef4cb47cceabb0833f4e649cbd38e65612be4c 100644
--- a/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
+++ b/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
@@ -58,13 +58,13 @@ InputPath=\Xerces\xml-xerces\c\Build\Win32\xml4com\Debug\xerces-com.dll
SOURCE="$(InputPath)"
BuildCmds= \
- echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_5_0D.dll "$(TargetDir)" \
- copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_5_0D.dll "$(TargetDir)" \
+ echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_6D.dll "$(TargetDir)" \
+ copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_6D.dll "$(TargetDir)" \
regsvr32 /s /c "$(TargetPath)" \
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
-"$(TargetDir)\xerces-c_2_5_0D.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(TargetDir)\xerces-c_2_6D.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -100,13 +100,13 @@ InputPath=\Xerces\xml-xerces\c\Build\Win32\xml4com\ReleaseMinDependency\xerces-c
SOURCE="$(InputPath)"
BuildCmds= \
- echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_5_0.dll $(TargetDir) \
- copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_5_0.dll $(TargetDir) \
+ echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_6.dll $(TargetDir) \
+ copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_6.dll $(TargetDir) \
regsvr32 /s /c "$(TargetPath)" \
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
-"$(TargetDir)\xerces-c_2_5_0.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(TargetDir)\xerces-c_2_6.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/Projects/Win32/VC7/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj b/Projects/Win32/VC7/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj
index bd3c4f06b8e9ff9c9bad282141499097b7909896..64ac7f40b54b5e31e102d52a1f1981a12200dd27 100644
--- a/Projects/Win32/VC7/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj
+++ b/Projects/Win32/VC7/xerces-all/XercesLib/XercesDeprecatedDOMLib.vcproj
@@ -41,12 +41,12 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="ws2_32.lib xerces-c_2.lib"
- OutputFile="..\..\..\..\..\Build\Win32\VC7\Release\xerces-depdom_2_5.dll"
+ OutputFile="..\..\..\..\..\Build\Win32\VC7\Release\xerces-depdom_2_6.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC7\Release"
- ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-depdom_2_5.pdb"
+ ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-depdom_2_6.pdb"
GenerateMapFile="TRUE"
- MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-depdom_2_5.map"
+ MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-depdom_2_6.map"
SubSystem="2"
BaseAddress="0x12000000"
ImportLibrary=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-depdom_2.lib"/>
@@ -100,11 +100,11 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="ws2_32.lib xerces-c_2D.lib"
- OutputFile="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-depdom_2_5D.dll"
+ OutputFile="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-depdom_2_6D.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC7\Debug"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-depdom_2_5D.pdb"
+ ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-depdom_2_6D.pdb"
SubSystem="2"
BaseAddress="0x12000000"
ImportLibrary=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-depdom_2D.lib"/>
diff --git a/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7/xerces-all/XercesLib/XercesLib.vcproj
index 650821e80a78cfec4bfc286de369ad7feb341f4e..cc122215b82efe00aab00b1f2baac34207078321 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_5.dll"
+ OutputFile="..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_6.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC7\Release"
- ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2_5.pdb"
+ ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Release/xerces-c_2_6.pdb"
GenerateMapFile="TRUE"
- MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-c_2_5.map"
+ MapFileName=".\..\..\..\..\..\Build\Win32\VC7\Release\obj/xerces-c_2_6.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_5D.dll"
+ OutputFile="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_6D.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\..\Build\Win32\VC7\Debug"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_5D.pdb"
+ ProgramDatabaseFile=".\..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2_6D.pdb"
SubSystem="2"
BaseAddress="0x12000000"
ImportLibrary="..\..\..\..\..\Build\Win32\VC7\Debug/xerces-c_2D.lib"/>
diff --git a/Projects/Win32/VC7/xerces-all/xerces-com/xerces-com.vcproj b/Projects/Win32/VC7/xerces-all/xerces-com/xerces-com.vcproj
index e2941b2043bfc5b9c698873c5eb0698dacae964b..40d5d58440b93dde1850b10de64f231858f3a0e1 100644
--- a/Projects/Win32/VC7/xerces-all/xerces-com/xerces-com.vcproj
+++ b/Projects/Win32/VC7/xerces-all/xerces-com/xerces-com.vcproj
@@ -41,12 +41,12 @@
<Tool
Name="VCCustomBuildTool"
Description="Performing registration"
- CommandLine="echo copy ..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_5_0.dll $(TargetDir)
-copy ..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_5_0.dll "$(TargetDir)"
+ CommandLine="echo copy ..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_6.dll $(TargetDir)
+copy ..\..\..\..\..\Build\Win32\VC7\Release\xerces-c_2_6.dll "$(TargetDir)"
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(TargetDir)xerces-c_2_5_0.dll;$(OutDir)\regsvr32.trg"/>
+ Outputs="$(TargetDir)xerces-c_2_6.dll;$(OutDir)\regsvr32.trg"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
@@ -103,12 +103,12 @@ echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
<Tool
Name="VCCustomBuildTool"
Description="Performing registration"
- CommandLine="echo copy ..\..\..\..\..\Build\Win32\VC7\Debug\xerces-c_2_5_0D.dll "$(TargetDir)"
-copy ..\..\..\..\..\Build\Win32\VC7\Debug\xerces-c_2_5_0D.dll "$(TargetDir)"
+ CommandLine="echo copy ..\..\..\..\..\Build\Win32\VC7\Debug\xerces-c_2_6D.dll "$(TargetDir)"
+copy ..\..\..\..\..\Build\Win32\VC7\Debug\xerces-c_2_6D.dll "$(TargetDir)"
regsvr32 /s /c "$(TargetPath)"
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
"
- Outputs="$(TargetDir)xerces-c_2_5_0D.dll;$(OutDir)\regsvr32.trg"/>
+ Outputs="$(TargetDir)xerces-c_2_6D.dll;$(OutDir)\regsvr32.trg"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
diff --git a/scripts/packageBinaries.pl b/scripts/packageBinaries.pl
index 0efccefafa79a806c51cc09a12b7b40859efafe9..502d5da8dae5fc5a17f951909cd28505e0d04fc0 100644
--- a/scripts/packageBinaries.pl
+++ b/scripts/packageBinaries.pl
@@ -48,11 +48,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_5_0");
- print (" -o \$HOME/xerces-c2_5_0-linux -c gcc -x g++ -m inmem -n fileonly -t native\n\n");
+ print (" perl packageBinaries.pl -s \$HOME/xerces-c-src2_6");
+ print (" -o \$HOME/xerces-c2_6-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_5_0");
- print (" -o\\xerces-c2_5_0-win32 [-n fileonly] [-t icu]\n\n");
+ print (" perl packageBinaries.pl -s \\xerces-c-src2_6");
+ print (" -o\\xerces-c2_5-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");
@@ -784,21 +784,21 @@ if ( ($platform =~ m/AIX/i) ||
print ("\n\nCopying ICU message bundles ...\n");
psystem("cp -f $XERCESCROOT/msg/XercesMessages*.res $targetdir/msg");
- psystem("cp -f $XERCESCROOT/lib/libXercesMessages25.0.so .");
- psystem("find . -name 'libXercesMessages25.0.so' -exec ln -s {} libXercesMessages25.so \\;");
- psystem("find . -name 'libXercesMessages25.so' -exec ln -s {} libXercesMessages.so \\;");
+ psystem("cp -f $XERCESCROOT/lib/libXercesMessages26.0.so .");
+ psystem("find . -name 'libXercesMessages26.0.so' -exec ln -s {} libXercesMessages26.so \\;");
+ psystem("find . -name 'libXercesMessages26.so' -exec ln -s {} libXercesMessages.so \\;");
- psystem("cp -f $XERCESCROOT/lib/libXercesMessages.so.25.0 .");
- psystem("find . -name 'libXercesMessages.so.25.0' -exec ln -s {} libXercesMessages.so.25 \\;");
- psystem("find . -name 'libXercesMessages.so.25' -exec ln -s {} libXercesMessages.so \\;");
+ psystem("cp -f $XERCESCROOT/lib/libXercesMessages.so.26.0 .");
+ psystem("find . -name 'libXercesMessages.so.26.0' -exec ln -s {} libXercesMessages.so.26 \\;");
+ psystem("find . -name 'libXercesMessages.so.26' -exec ln -s {} libXercesMessages.so \\;");
- psystem("cp -f $XERCESCROOT/lib/libXercesMessages.sl.25.0 .");
- psystem("find . -name 'libXercesMessages.sl.25.0' -exec ln -s {} libXercesMessages.sl.25 \\;");
- psystem("find . -name 'libXercesMessages.sl.25' -exec ln -s {} libXercesMessages.sl \\;");
+ psystem("cp -f $XERCESCROOT/lib/libXercesMessages.sl.26.0 .");
+ psystem("find . -name 'libXercesMessages.sl.26.0' -exec ln -s {} libXercesMessages.sl.26 \\;");
+ psystem("find . -name 'libXercesMessages.sl.26' -exec ln -s {} libXercesMessages.sl \\;");
- psystem("cp -f $XERCESCROOT/lib/libXercesMessages25.0.a .");
- psystem("find . -name 'libXercesMessages25.0.a' -exec ln -s {} libXercesMessages25.a \\;");
- psystem("find . -name 'libXercesMessages25.a' -exec ln -s {} libXercesMessages.a \\;");
+ psystem("cp -f $XERCESCROOT/lib/libXercesMessages26.0.a .");
+ psystem("find . -name 'libXercesMessages26.0.a' -exec ln -s {} libXercesMessages26.a \\;");
+ psystem("find . -name 'libXercesMessages26.a' -exec ln -s {} libXercesMessages.a \\;");
}
@@ -817,59 +817,59 @@ if ( ($platform =~ m/AIX/i) ||
pchdir ("$targetdir/lib");
psystem("rm -f libxerces-c* ");
- if ((-e "$XERCESCROOT/lib/libxerces-c.so.25.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c.so.25.0 .");
- psystem("ln -s libxerces-c.so.25.0 libxerces-c.so.25 ");
- psystem("ln -s libxerces-c.so.25 libxerces-c.so ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c.so.26.0" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c.so.26.0 .");
+ psystem("ln -s libxerces-c.so.26.0 libxerces-c.so.26 ");
+ psystem("ln -s libxerces-c.so.26 libxerces-c.so ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-depdom.so.25.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-depdom.so.25.0 .");
- psystem("ln -s libxerces-depdom.so.25.0 libxerces-depdom.so.25 ");
- psystem("ln -s libxerces-depdom.so.25 libxerces-depdom.so ");
+ if ((-e "$XERCESCROOT/lib/libxerces-depdom.so.26.0" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-depdom.so.26.0 .");
+ psystem("ln -s libxerces-depdom.so.26.0 libxerces-depdom.so.26 ");
+ psystem("ln -s libxerces-depdom.so.26 libxerces-depdom.so ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-c.sl.25.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c.sl.25.0 .");
- psystem("ln -s libxerces-c.sl.25.0 libxerces-c.sl.25 ");
- psystem("ln -s libxerces-c.sl.25 libxerces-c.sl ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c.sl.26.0" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c.sl.26.0 .");
+ psystem("ln -s libxerces-c.sl.26.0 libxerces-c.sl.26 ");
+ psystem("ln -s libxerces-c.sl.26 libxerces-c.sl ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-depdom.sl.25.0" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-depdom.sl.25.0 .");
- psystem("ln -s libxerces-depdom.sl.25.0 libxerces-depdom.sl.25 ");
- psystem("ln -s libxerces-depdom.sl.25 libxerces-depdom.sl ");
+ if ((-e "$XERCESCROOT/lib/libxerces-depdom.sl.26.0" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-depdom.sl.26.0 .");
+ psystem("ln -s libxerces-depdom.sl.26.0 libxerces-depdom.sl.26 ");
+ psystem("ln -s libxerces-depdom.sl.26 libxerces-depdom.sl ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-c25.0.so" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c25.0.so .");
- psystem("ln -s libxerces-c25.0.so libxerces-c25.so ");
- psystem("ln -s libxerces-c25.so libxerces-c.so ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c26.0.so" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c26.0.so .");
+ psystem("ln -s libxerces-c26.0.so libxerces-c26.so ");
+ psystem("ln -s libxerces-c26.so libxerces-c.so ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-depdom25.0.so" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-depdom25.0.so .");
- psystem("ln -s libxerces-depdom25.0.so libxerces-depdom25.so ");
- psystem("ln -s libxerces-depdom25.so libxerces-depdom.so ");
+ if ((-e "$XERCESCROOT/lib/libxerces-depdom26.0.so" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-depdom26.0.so .");
+ psystem("ln -s libxerces-depdom26.0.so libxerces-depdom26.so ");
+ psystem("ln -s libxerces-depdom26.so libxerces-depdom.so ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-c25.0.a" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c25.0.a . ");
- psystem("ln -s libxerces-c25.0.a libxerces-c25.a ");
- psystem("ln -s libxerces-c25.a libxerces-c.a ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c26.0.a" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c26.0.a . ");
+ psystem("ln -s libxerces-c26.0.a libxerces-c26.a ");
+ psystem("ln -s libxerces-c26.a libxerces-c.a ");
}
- if ((-e "$XERCESCROOT/lib/libxerces-depdom25.0.a" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-depdom25.0.a . ");
- psystem("ln -s libxerces-depdom25.0.a libxerces-depdom25.a ");
- psystem("ln -s libxerces-depdom25.a libxerces-depdom.a ");
+ if ((-e "$XERCESCROOT/lib/libxerces-depdom26.0.a" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-depdom26.0.a . ");
+ psystem("ln -s libxerces-depdom26.0.a libxerces-depdom26.a ");
+ psystem("ln -s libxerces-depdom26.a libxerces-depdom.a ");
}
# Mac OS X
- if ((-e "$XERCESCROOT/lib/libxerces-c.25.0.dylib" )) {
- psystem("cp -f $XERCESCROOT/lib/libxerces-c.25.0.dylib .");
- psystem("ln -s libxerces-c.25.0.dylib libxerces-c.25.dylib ");
- psystem("ln -s libxerces-c.25.dylib libxerces-c.dylib ");
+ if ((-e "$XERCESCROOT/lib/libxerces-c.26.0.dylib" )) {
+ psystem("cp -f $XERCESCROOT/lib/libxerces-c.26.0.dylib .");
+ psystem("ln -s libxerces-c.26.0.dylib libxerces-c.26.dylib ");
+ psystem("ln -s libxerces-c.26.dylib libxerces-c.dylib ");
}
# Populate the Message Catalog Files
@@ -1174,7 +1174,7 @@ sub change_windows_project_for_ICU() {
if ($MsgLoader)
{
- $line =~ s/user32.lib/user32.lib $icuuc.lib XercesMessages2_5_0.lib/g;
+ $line =~ s/user32.lib/user32.lib $icuuc.lib XercesMessages2_6_0.lib/g;
}
elsif ($Transcoder)
{
@@ -1223,7 +1223,7 @@ sub change_windows_makefile_for_ICU() {
if ($MsgLoader)
{
- $line =~ s/user32.lib/user32.lib $icuuc.lib XercesMessages2_5_0.lib/g;
+ $line =~ s/user32.lib/user32.lib $icuuc.lib XercesMessages2_6_0.lib/g;
}
elsif ($Transcoder)
{
@@ -1270,7 +1270,7 @@ sub change_windows_project_for_ICU_VC7() {
if ($MsgLoader)
{
- $line =~ s/AdditionalDependencies=\"([^"]*)/AdditionalDependencies=\"$icuuc.lib XercesMessages2_5_0.lib $1/;
+ $line =~ s/AdditionalDependencies=\"([^"]*)/AdditionalDependencies=\"$icuuc.lib XercesMessages2_6_0.lib $1/;
}
elsif ($Transcoder)
{
diff --git a/src/xercesc/Makefile.incl b/src/xercesc/Makefile.incl
index ccd0b5d6fa38a2ea0b39d5295c4054d4ab60cc07..de719c8db2c8e9cd3e79f57e9dbf0eb3bef4e4e3 100644
--- a/src/xercesc/Makefile.incl
+++ b/src/xercesc/Makefile.incl
@@ -211,7 +211,7 @@ else
endif
ifeq (${MESSAGELOADER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc30 -licudata30 -lXercesMessages25
+ ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -licuuc30 -licudata30 -lXercesMessages26
endif
ifeq (${CXXVER}, v5compat)
diff --git a/src/xercesc/com/xml4com.idl b/src/xercesc/com/xml4com.idl
index 8ad5c595fae75ab0d927337c9d1f0171665194b9..7ed0f442e894e1a3e454e4b9a3fcf61a7aa7f553 100644
--- a/src/xercesc/com/xml4com.idl
+++ b/src/xercesc/com/xml4com.idl
@@ -29,8 +29,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.50),
- helpstring("Xerces XML Parser 2.5.0")
+ version(2.60),
+ helpstring("Xerces XML Parser 2.6.0")
]
library Xerces
{
diff --git a/src/xercesc/configure.in b/src/xercesc/configure.in
index ef6a78f01fda16c082e880e2c369448b80ff7d67..4a7a339dc46fc0a3dc0f52236e95e4f2ca241b87 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.5.0)
+dnl AM_INIT_AUTOMAKE(xerces-c,2.6.0)
dnl Checks for programs
AC_PROG_CC
AC_PROG_CXX
diff --git a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
index ef4220da242fbb305dfb3db15f039fba524bc557..846ef2e2683a22c047c31a7cd1b00760d959238f 100644
--- a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
+++ b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.23 2004/09/30 18:52:59 peiyongz
+ * XercesC2_6_0 updates
+ *
* Revision 1.22 2004/09/08 13:56:33 peiyongz
* Apache License Version 2.0
*
@@ -146,7 +149,7 @@ XERCES_CPP_NAMESPACE_BEGIN
*/
#if defined(_WIN32) || defined(WIN32)
-extern "C" void U_IMPORT *XercesMessages2_5_0_dat;
+extern "C" void U_IMPORT *XercesMessages2_6_0_dat;
#else
extern "C" void U_IMPORT *XercesMessages_dat;
#endif
@@ -170,7 +173,7 @@ static void setAppData()
setAppDataDone = true;
UErrorCode err = U_ZERO_ERROR;
#if defined(_WIN32) || defined(WIN32)
- udata_setAppData("XercesMessages", &XercesMessages2_5_0_dat, &err);
+ udata_setAppData("XercesMessages", &XercesMessages2_6_0_dat, &err);
#else
udata_setAppData("XercesMessages", &XercesMessages_dat, &err);
#endif
diff --git a/src/xercesc/util/Platforms/Win32/Version.rc b/src/xercesc/util/Platforms/Win32/Version.rc
index 915c5b9e2b62ac5245b001840e8dbc5b29b8730f..7fdb9f8d0f103922a7c9046294c30df43589a2ea 100644
--- a/src/xercesc/util/Platforms/Win32/Version.rc
+++ b/src/xercesc/util/Platforms/Win32/Version.rc
@@ -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.5.0\0"
- VALUE "FileVersion", "2, 5, 0\0"
- VALUE "InternalName", "xerces-c_2_5.dll\0"
+ VALUE "FileDescription", "Shared Library for Xerces-C Version 2.6.0\0"
+ VALUE "FileVersion", "2, 6, 0\0"
+ VALUE "InternalName", "xerces-c_2_6.dll\0"
VALUE "LegalCopyright", "Copyright © Apache Software Foundation 2000 subject to licensing terms\0"
VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "xerces-c_2_5.dll\0"
+ VALUE "OriginalFilename", "xerces-c_2_6.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Xerces-C Version 2.5.0\0"
- VALUE "ProductVersion", "2, 5, 0\0"
+ VALUE "ProductName", "Xerces-C Version 2.6.0\0"
+ VALUE "ProductVersion", "2, 6, 0\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/src/xercesc/util/XercesVersion.hpp b/src/xercesc/util/XercesVersion.hpp
index d140ef7b24d75c29636fceb2a4225862edf5f28f..b333ac7fba8f2312b4374fd8e8c72bb41f3a2a1e 100644
--- a/src/xercesc/util/XercesVersion.hpp
+++ b/src/xercesc/util/XercesVersion.hpp
@@ -122,7 +122,7 @@
*/
#define XERCES_VERSION_MAJOR 2
-#define XERCES_VERSION_MINOR 5
+#define XERCES_VERSION_MINOR 6
#define XERCES_VERSION_REVISION 0
/***
diff --git a/version.incl b/version.incl
index ff3cb8a813887406d5b3a0d8d504ed39f19f260e..e56255d1b9366f202af3a6a789b3879ae412c94f 100644
--- a/version.incl
+++ b/version.incl
@@ -17,6 +17,6 @@
#
# $Id$
#
-VER=2_5_0
-SO_TARGET_VERSION=25
+VER=2_6_0
+SO_TARGET_VERSION=26
SO_TARGET_VERSION_MAJOR=0
diff --git a/xerces-c.spec b/xerces-c.spec
index cd857bf1ac5c8768d5be76853e9322c9c35cc876..ef30809b74e7e8108390b58b51249c22370c0fde 100644
--- a/xerces-c.spec
+++ b/xerces-c.spec
@@ -1,4 +1,4 @@
-%define tarversion 2_5_0
+%define tarversion 2_6_0
# threads
# values: pthreads, none
@@ -6,7 +6,7 @@
Summary: Xerces-C++ validating XML parser
Name: xerces-c
-Version: 2.5.0
+Version: 2.6.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.25 $RPM_BUILD_ROOT%{prefix}/lib/libxerces-c.so
+ln -sf %{prefix}/lib/libxerces-c.so.26 $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