[mapguide-commits] r9410 - in sandbox/adsk/3.2q/Oem/dbxml: dbxml/build_windows xqilla/Win32Projects/VS xqilla/src/dom-api/impl

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Nov 1 23:55:56 PDT 2018 

Author: christinebao
Date: 2018-11-01 23:55:56 -0700 (Thu, 01 Nov 2018)
New Revision: 9410

Modified:
   sandbox/adsk/3.2q/Oem/dbxml/dbxml/build_windows/dbxml.vcxproj
   sandbox/adsk/3.2q/Oem/dbxml/xqilla/Win32Projects/VS/xqilla.vcxproj
   sandbox/adsk/3.2q/Oem/dbxml/xqilla/src/dom-api/impl/XPathDocumentImpl.cpp
   sandbox/adsk/3.2q/Oem/dbxml/xqilla/src/dom-api/impl/XPathNamespaceImpl.cpp
Log:
Upgrade xerces to 1.321.2

Here are the changes:
1. xerces-c-src in dmxml folder is very old, use new xerces instead, so I change include path and lib path in xqilla.vcxproj to new xerces which downloads from Artifactory
2. when use new xerces in xqilla will cause build error because DOMNodeImpl constructor is modified, according to new version of xqilla, add "this point" to the fist param of new DOMNodeImpl constructor. 
BTW, files in new xqilla and old xqilla are very different, so I didn't upgrade xqilla source code

Modified: sandbox/adsk/3.2q/Oem/dbxml/dbxml/build_windows/dbxml.vcxproj
===================================================================
--- sandbox/adsk/3.2q/Oem/dbxml/dbxml/build_windows/dbxml.vcxproj	2018-09-12 15:10:52 UTC (rev 9409)
+++ sandbox/adsk/3.2q/Oem/dbxml/dbxml/build_windows/dbxml.vcxproj	2018-11-02 06:55:56 UTC (rev 9410)
@@ -203,15 +203,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;../include;../src/dbxml;../../db-4.8.26/build_windows;../../db-4.8.26/include;../../db-4.8.26/dbinc;../../xerces-c-src/include;../../xerces-c-src/src;../../xqilla/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../include;../src/dbxml;../../db-4.8.26/build_windows;../../db-4.8.26/include;../../db-4.8.26/dbinc;../../../xerces/inc;../../xqilla/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;DBXML_CREATE_DLL;_DBXML_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xerces-ad-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)libdbxml25d.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../xerces/lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -312,15 +312,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;../include;../src/dbxml;../../db-4.8.26/build_windows;../../db-4.8.26/include;../../db-4.8.26/dbinc;../../xerces-c-src/include;../../xerces-c-src/src;../../xqilla/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../include;../src/dbxml;../../db-4.8.26/build_windows;../../db-4.8.26/include;../../db-4.8.26/dbinc;../../../xerces/inc;../../xqilla/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;DBXML_CREATE_DLL;_DBXML_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xerces-ad-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)libdbxml25.dll</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../xerces/lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)libdbxml25.pdb</ProgramDatabaseFile>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -742,9 +742,6 @@
     <ProjectReference Include="..\..\db-4.8.26\build_windows\db_dll.vcxproj">
       <Project>{96c27024-6dee-45ed-bcc3-a731949131fa}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\xerces-c-src\projects\Win32\VS\xerces-all\XercesLib\XercesLib.vcxproj">
-      <Project>{152ce948-f659-4206-a50a-1d2b9658ef96}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\xqilla\Win32Projects\VS\xqilla.vcxproj">
       <Project>{63e85107-41e0-4fc7-8083-40e85861b426}</Project>
     </ProjectReference>

Modified: sandbox/adsk/3.2q/Oem/dbxml/xqilla/Win32Projects/VS/xqilla.vcxproj
===================================================================
--- sandbox/adsk/3.2q/Oem/dbxml/xqilla/Win32Projects/VS/xqilla.vcxproj	2018-09-12 15:10:52 UTC (rev 9409)
+++ sandbox/adsk/3.2q/Oem/dbxml/xqilla/Win32Projects/VS/xqilla.vcxproj	2018-11-02 06:55:56 UTC (rev 9410)
@@ -294,7 +294,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../src/lexer;../../../xerces-c-src/include;../../../xerces-c-src/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../src/lexer;../../../../xerces/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;_USRDLL;XQILLA_APIS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -313,10 +313,10 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/machine:x64 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xerces-ad-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xqilla24d.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../../xerces/lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)xqilla24d.pdb</ProgramDatabaseFile>
       <OptimizeReferences>false</OptimizeReferences>
@@ -476,7 +476,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../src/lexer;../../../xerces-c-src/include;../../../xerces-c-src/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../src/lexer;../../../../xerces/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_USRDLL;XQILLA_APIS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -495,10 +495,10 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/machine:x64 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>xerces-ad-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)xqilla24.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../../xerces-c-src/Build/$(Platform)/VC9/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../../../xerces/lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)xqilla24.pdb</ProgramDatabaseFile>
       <OptimizeReferences>true</OptimizeReferences>
@@ -1486,11 +1486,6 @@
     <ClCompile Include="..\..\src\xqc\XQillaXQCSequence.cpp" />
     <ClCompile Include="..\..\src\xqc\XQillaXQCStaticContext.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\xerces-c-src\projects\Win32\VS\xerces-all\XercesLib\XercesLib.vcxproj">
-      <Project>{152ce948-f659-4206-a50a-1d2b9658ef96}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: sandbox/adsk/3.2q/Oem/dbxml/xqilla/src/dom-api/impl/XPathDocumentImpl.cpp
===================================================================
--- sandbox/adsk/3.2q/Oem/dbxml/xqilla/src/dom-api/impl/XPathDocumentImpl.cpp	2018-09-12 15:10:52 UTC (rev 9409)
+++ sandbox/adsk/3.2q/Oem/dbxml/xqilla/src/dom-api/impl/XPathDocumentImpl.cpp	2018-11-02 06:55:56 UTC (rev 9410)
@@ -64,7 +64,7 @@
     if (thisNodeImpl->isReadOnly())
         throw DOMException(DOMException::NO_MODIFICATION_ALLOWED_ERR, 0, getMemoryManager());
 
-    DOMNode* thisNode = castToNode(&fParent);
+    DOMNode* thisNode = fParent.fContainingNode;
     if (newChild->getOwnerDocument() != thisNode)
         throw DOMException(DOMException::WRONG_DOCUMENT_ERR, 0, getMemoryManager());
 

Modified: sandbox/adsk/3.2q/Oem/dbxml/xqilla/src/dom-api/impl/XPathNamespaceImpl.cpp
===================================================================
--- sandbox/adsk/3.2q/Oem/dbxml/xqilla/src/dom-api/impl/XPathNamespaceImpl.cpp	2018-09-12 15:10:52 UTC (rev 9409)
+++ sandbox/adsk/3.2q/Oem/dbxml/xqilla/src/dom-api/impl/XPathNamespaceImpl.cpp	2018-11-02 06:55:56 UTC (rev 9410)
@@ -35,7 +35,7 @@
 
 XPathNamespaceImpl::XPathNamespaceImpl(const XMLCh* const nsPrefix, 
 		const XMLCh* const nsUri, DOMElement *owner, DOMDocument *docOwner) 
-	: fNode(docOwner)
+	: fNode(this, docOwner)
 {
     DOMNodeImpl *argImpl = castToNodeImpl(this);
 
@@ -56,7 +56,7 @@
 }
 
 XPathNamespaceImpl::XPathNamespaceImpl(const XPathNamespaceImpl &other) 
-	: fNode(other.fNode), uri(other.uri), prefix(other.prefix)
+	: fNode(this, other.fNode), uri(other.uri), prefix(other.prefix)
 {
 }
 
@@ -198,7 +198,7 @@
 
     //if it is a custom node and bigger than us we must ask it for the order
     if(otherType > DOMXPathNamespace::XPATH_NAMESPACE_NODE) {
-        DOMNodeImpl tmp(0);
+        DOMNodeImpl tmp(const_cast<XPathNamespaceImpl *>(this), 0);
 #if _XERCES_VERSION >= 30000
         return tmp.reverseTreeOrderBitPattern(other->compareDocumentPosition(this));
 #else

More information about the mapguide-commits mailing list