Merge pull request hpcc-systems#18797 from Michael-Gardner/HPCC-32104

HPCC-32104 Fix for xml:base issue with updated xml/xsl libraries Reviewed-By: Greg Panagiotatos <[email protected]> Reviewed-by: Gordon Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
AttilaVamos · Jun 24, 2024 · a5af4ee · a5af4ee
2 parents 84529d4 + 475a4fc
commit a5af4ee
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/docs/BuildTools/cmake_config/HPCCSystemAdmin.txt b/docs/BuildTools/cmake_config/HPCCSystemAdmin.txt
@@ -26,9 +26,7 @@ IF(MAKE_DOCS)
       LIST(APPEND HELP_DEPENDENCIES  ${T})
      ENDIF()
   ENDFOREACH()
-
-  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/HPCCSystemAdministratorsGuide.xml" ${PORTAL_HTML_DIR}/SystemAdministratorsGuide_${DOC_LANG}  "system_administration_guide_html_${DOC_LANG}" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
-
+
   SET(HELP_DEPENDENCIES)
   GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
   FOREACH(T ${Current_Targets})
@@ -37,5 +35,4 @@ IF(MAKE_DOCS)
      ENDIF()
   ENDFOREACH()
 
-  DOCBOOK_TO_HTML(${PORTAL_GEN_XSL} "${CMAKE_CURRENT_BINARY_DIR}/SecMgrInc.xml" ${PORTAL_HTML_DIR}/SecurityManagerGuide_${DOC_LANG}  "security_manager_guide_html_${DOC_LANG}" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
 ENDIF(MAKE_DOCS)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -29,7 +29,7 @@ set (DOCBOOK_XSL ${CMAKE_CURRENT_BINARY_DIR}/resources/docbook-xsl)
 set (XML_CATALOG ${CMAKE_CURRENT_BINARY_DIR}/BuildTools/catalog.xml)
 set (DOC_VERSION "${HPCC_MAJOR}.${HPCC_MINOR}.${HPCC_POINT}")
 set (FO_XSL ${CMAKE_CURRENT_BINARY_DIR}/BuildTools/fo.xsl)
-set (VERSION_DIR ${CMAKE_CURRENT_BINARY_DIR}/)
+set (VERSION_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set (ECLIPSE_HTML_XSL ${CMAKE_CURRENT_BINARY_DIR}/BuildTools/EclipseHelp.xsl)
 #set (ECL_REFERENCE_XML ${CMAKE_CURRENT_BINARY_DIR}/ECLReference/ECLReference.xml)
 set (HTML_HELP_XSL ${CMAKE_CURRENT_BINARY_DIR}/resources/docbook-xsl/htmlhelp/htmlhelp.xsl)

diff --git a/docs/EN_US/ECLWatch/TheECLWatchMan.xml b/docs/EN_US/ECLWatch/TheECLWatchMan.xml
@@ -42,17 +42,17 @@
       <para />
     </legalnotice>
 
-    <xi:include href="common/Version.xml"
+    <xi:include href="../common/Version.xml"
                 xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml"
+    <xi:include href="../common/Version.xml"
                 xpointer="xpointer(//*[@id='DateVer'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <corpname>HPCC Systems<superscript>®</superscript></corpname>
 
-    <xi:include href="common/Version.xml"
+    <xi:include href="../common/Version.xml"
                 xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 

diff --git a/docs/PT_BR/Installing_and_RunningTheHPCCPlatform/Inst-Mods/Hardware.xml b/docs/PT_BR/Installing_and_RunningTheHPCCPlatform/Inst-Mods/Hardware.xml
@@ -39,15 +39,15 @@
       <para/>
     </legalnotice>
 
-    <xi:include href="../../common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="../../../common/Version.xml" xpointer="FooterInfo"
                 xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
-    <xi:include href="../../common/Version.xml" xpointer="DateVer"
+    <xi:include href="../../../common/Version.xml" xpointer="DateVer"
                 xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <corpname>HPCC Systems</corpname>
 
-    <xi:include href="../../common/Version.xml" xpointer="Copyright"
+    <xi:include href="../../../common/Version.xml" xpointer="Copyright"
                 xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
     <mediaobject role="logo">