HPCC-17207 creating HTML files

The generated HTML files will be in docs/PortalHTML directory
Create a zip file for Portal HTML
Also add generating ECLRefernece HTML for ECLIDE documentation

cmake_modules/docMacros.cmake

@@ -99,33 +99,47 @@ MACRO(DOCBOOK_TO_PDF _xsl _file _name)
         ENDIF(MAKE_DOCS)
 ENDMACRO(DOCBOOK_TO_PDF targetname_suffix srcfile outfile targetdir deps_list)
 
-MACRO(DOCBOOK_TO_HTML _xsl_file _xml_file _out_dir)
+MACRO(DOCBOOK_TO_HTML _xsl_file _xml_file _out_dir _html_target _css_path _zip_target)
     IF(MAKE_DOCS)
-       set(_html_zip "doc_generate_html_zip")
-       set(_html_files "_generate_html_files")
+       if("${_html_target}" STREQUAL "")
+           set(_html_target "_generate_html_files")
+       endif()
+
+       if("${_css_path}" STREQUAL "")
+           set(_css_path "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css")
+       endif()
+       get_filename_component(css_file_name ${_css_path} NAME)
 
        STRING(REGEX REPLACE "(.+)/([^/]+)$" "\\1" _out_dir1 "${_out_dir}")
        STRING(REGEX REPLACE ".+/([^/]+)$" "\\1" _out_dir2 "${_out_dir}")
-       SET(_zip_file ${_out_dir2}-${version}-${stagever}.zip)
+
+       if(NOT "${_zip_target}" STREQUAL "")
+          SET(_zip_file ${_out_dir2}-${version}-${stagever}.zip)
+       endif()
        ADD_CUSTOM_COMMAND(
            COMMAND mkdir -p ${_out_dir}
-           COMMAND cp ${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css ${_out_dir}/
-           OUTPUT ${_out_dir}/eclipsehelp.css
+           COMMAND cp ${_css_path} ${_out_dir}/
+           OUTPUT ${_out_dir}/${css_file_name}
            )
-       ADD_CUSTOM_TARGET(${_html_files}
-           COMMAND xsltproc --nonet --xinclude ${_xsl_file} ${_xml_file}
+       ADD_CUSTOM_TARGET(${_html_target}
+           COMMAND xsltproc --nonet --xinclude --stringparam html.stylesheet ${css_file_name} --stringparam generate.toc "book toc"  --param use.id.as.filename 1 --param chapter.autolabel 0  ${_xsl_file} ${_xml_file}
            WORKING_DIRECTORY ${_out_dir}
-           DEPENDS docbook-expand ${_out_dir}/eclipsehelp.css ${HELP_DEPENDENCIES}
-           SOURCES ${_xsl_file}
+           DEPENDS docbook-expand ${_out_dir}/${css_file_name} ${HELP_DEPENDENCIES}
+           #SOURCES ${_xsl_file}
            )
        SET(HELP_DEPENDENCIES)
-       ADD_CUSTOM_COMMAND(
-           COMMAND zip -r ${_zip_file} ${_out_dir2}
-           WORKING_DIRECTORY ${_out_dir1}
-           OUTPUT ${_zip_file}
-           )
-       ADD_CUSTOM_TARGET(${_html_zip} ALL DEPENDS ${_html_files} ${_zip_file})
-       set_property(GLOBAL APPEND PROPERTY DOC_TARGETS ${_html_zip})
+
+       if(NOT "${_zip_target}" STREQUAL "")
+           ADD_CUSTOM_COMMAND(
+               COMMAND zip -r ${_zip_file} ${_out_dir2}
+               WORKING_DIRECTORY ${_out_dir1}
+               OUTPUT ${_zip_file}
+               )
+           ADD_CUSTOM_TARGET(${_zip_target} ALL DEPENDS ${_html_target} ${_zip_file})
+           set_property(GLOBAL APPEND PROPERTY DOC_TARGETS ${_zip_target})
+       else()
+           set_property(GLOBAL APPEND PROPERTY DOC_TARGETS ${_html_target})
+       endif()
     ENDIF(MAKE_DOCS)
 ENDMACRO(DOCBOOK_TO_HTML)
 

docs/CMakeLists.txt

@@ -31,6 +31,8 @@ set (FO_XSL ${CMAKE_CURRENT_BINARY_DIR}/BuildTools/fo.xsl)
 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)
+
 
 
 if ( "${HPCC_MATURITY}" STREQUAL "release" )
@@ -39,6 +41,8 @@ else()
 	set (DOC_VERSION "${DOC_VERSION}-${HPCC_MATURITY}${HPCC_SEQUENCE}")
 endif()
 
+set (PORTAL_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/PortalHTML")
+
 # Build image file list to add to source watch.
 file(GLOB_RECURSE DOC_IMAGES_LIST images/*)
 
@@ -54,6 +58,7 @@ add_subdirectory(ECLProgrammersGuide)
 add_subdirectory(ECLStandardLibraryReference)
 add_subdirectory(ECLReference)
 add_subdirectory(EclipseHelp)
+add_subdirectory(HTMLHelp)
 add_subdirectory(HPCCClientTools)
 add_subdirectory(HPCCCertify)
 add_subdirectory(HPCCDataHandling)
@@ -70,6 +75,7 @@ add_subdirectory(ECLPluginForEclipse)
 add_subdirectory(ECLScheduler)
 add_subdirectory(ECLWatch)
 
+
 # Docs automation
 if (DOCS_AUTO)
    add_subdirectory(XMLGeneration)
@@ -80,5 +86,7 @@ endif()
 #WIP -  Docs
 #add_subdirectory(RuningHPCCinAmazonWebServicesEC2)
 
+add_subdirectory(PortalHTML)
+
 GET_PROPERTY(_targets GLOBAL PROPERTY DOC_TARGETS)
 add_custom_target(docs ALL DEPENDS ${_targets})

docs/DynamicESDL/CMakeLists.txt

@@ -16,3 +16,14 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} DynamicESDL_Includer.xml "DynamicESDL" "DESDL-Mods")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*DynamicESDL.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+    ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/DynamicESDL_Includer.xml" ${PORTAL_HTML_DIR}/DynamicESDL  "dyanmic_esdl_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/DynamicESDL/DynamicESDL_Includer.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -552,7 +552,7 @@ OUTPUT(ds_out, NAMED('AddThisResponse')); </programlisting>
   </chapter>
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_ESDL_CLI.xml"
-              xpointer="ESDL_CLI" xmlns:xi="http://www.w3.org/2001/XInclude" />
+              xpointer="xpointer(//*[@id='ESDL_CLI'])" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <chapter>
     <title>ESDL Language Reference</title>

docs/ECLLanguageReference/CMakeLists.txt

@@ -16,3 +16,14 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} ECLR-includer.xml "ECLLanguageReference" "ECLR_mods")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*ECLLanguageReference.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+    ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/ECLR-includer.xml" ${PORTAL_HTML_DIR}/ECLR  "lang_ref_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/ECLLanguageReference/ECLR-includer.xml

@@ -38,7 +38,7 @@
       "A"</link> (WHICH SEE).</para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='DateVer'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <releaseinfo>© 2017 HPCC Systems<superscript>®</superscript>. All rights

docs/ECLPlayground/CMakeLists.txt

@@ -16,3 +16,15 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} ECLPlayground-includer.xml "ECL_Playground" "ECLPlay-Mods")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*ECL_Playground.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+    ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/ECLPlayground-includer.xml" ${PORTAL_HTML_DIR}/ECLPlayground  "play_ground_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+
+ENDIF(MAKE_DOCS)

docs/ECLPlayground/ECLPlayground-includer.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -62,7 +62,7 @@
     <title><emphasis>ECL Playground</emphasis></title>
 
     <xi:include href="ECLPlayground/ECLPlay-Mods/ECL_Playground.xml"
-                xpointer="ECL_Playground"
+                xpointer="xpointer(//*[@id='ECL_Playground'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 </book>

docs/ECLPluginForEclipse/CMakeLists.txt

@@ -16,3 +16,14 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} ECL_Plugin_for_Eclipse.xml "ECL_Plugin_for_EclipseIDE")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*ECL_Plugin_for_EclipseIDE.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+    ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/ECL_Plugin_for_Eclipse.xml" ${PORTAL_HTML_DIR}/Eclipse_Plugin  "eclipse_plugin_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/ECLPluginForEclipse/ECL_Plugin_for_Eclipse.xml

@@ -40,12 +40,12 @@
       <para><emphasis role="redbold"> </emphasis></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <!--Release Info makes a running page footer:now an include from version.xml-->
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='DateVer'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <!--The include statement pulls in the date_ver from version.xml-->
@@ -54,7 +54,7 @@
 
     <!--corpname never prints-->
 
-    <xi:include href="common/Version.xml" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <!--Copyright tag now gets copyright from version.xml-->

docs/ECLProgrammersGuide/CMakeLists.txt

@@ -29,4 +29,14 @@ IF(MAKE_DOCS)
 	)
 
   ADD_CUSTOM_TARGET(ECL_Code_Files ALL DEPENDS  ${zip_out_dir}/ECL_Code_Files.zip)
+
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*ECLProgrammersGuide.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/PrGd-Includer.xml" ${PORTAL_HTML_DIR}/ProgrammersGuide  "programmers_guide_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
 ENDIF(MAKE_DOCS)

docs/ECLProgrammersGuide/PrGd-Includer.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">

docs/ECLReference/ECLReference.xml

@@ -5,7 +5,13 @@
   <title>ECL Reference</title>
 
   <setinfo>
-    <corpauthor>HPCC Systems<superscript>®</superscript></corpauthor>
+    <corpauthor>HPCC Systems<superscript>®</superscript>
+      <para>
+        <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='CHMVer'])"
+                xmlns:xi="http://www.w3.org/2001/XInclude" />
+      </para>
+    </corpauthor>
+
   </setinfo>
 
   <xi:include href="../ECLLanguageReference/ECLR-includer.xml"

docs/ECLScheduler/CMakeLists.txt

@@ -14,4 +14,16 @@
 #    limitations under the License.
 ################################################################################
 
-DOCBOOK_TO_PDF( ${FO_XSL} ECLScheduler.xml "TheECLScheduler" "ECLSched-Mods")
+DOCBOOK_TO_PDF( ${FO_XSL} ECLScheduler.xml "TheECLScheduler" "ECLSched-Mods")
+
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*TheECLScheduler.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/ECLScheduler.xml" ${PORTAL_HTML_DIR}/Scheduler  "scheduler_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/ECLScheduler/ECLScheduler.xml

@@ -42,15 +42,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='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="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -112,11 +112,11 @@
   </chapter>
 
   <xi:include href="ECLScheduler/ECLSched-Mods/ECLSchedComp.xml"
-              xpointer="ECLSched_comp"
+              xpointer="xpointer(//*[@id='ECLSched_comp'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="ECLScheduler/ECLSched-Mods/ECLSchedAdmin.xml"
-              xpointer="ECLSched-Admin"
+              xpointer="xpointer(//*[@id='ECLSched-Admin'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <chapter>
@@ -130,7 +130,7 @@
       <title>WHEN</title>
 
       <xi:include href="ECLLanguageReference/ECLR_mods/BltInFunc-WHEN.xml"
-                  xpointer="SchWhen"
+                  xpointer="xpointer(//*[@id='SchWhen'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
 
@@ -138,7 +138,7 @@
       <title>NOTIFY</title>
 
       <xi:include href="ECLLanguageReference/ECLR_mods/BltInFunc-NOTIFY.xml"
-                  xpointer="SchNOTIFY"
+                  xpointer="xpointer(//*[@id='SchNOTIFY'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
 
@@ -146,7 +146,7 @@
       <title>EVENT</title>
 
       <xi:include href="ECLLanguageReference/ECLR_mods/BltInFunc-EVENT.xml"
-                  xpointer="SchEvent"
+                  xpointer="xpointer(//*[@id='SchEvent'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
 
@@ -154,7 +154,7 @@
       <title>CRON</title>
 
       <xi:include href="ECLLanguageReference/ECLR_mods/BltInFunc-CRON.xml"
-                  xpointer="SchCRON"
+                  xpointer="xpointer(//*[@id='SchCRON'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
 
@@ -162,7 +162,7 @@
       <title>WAIT</title>
 
       <xi:include href="ECLLanguageReference/ECLR_mods/BltInFunc-WAIT.xml"
-                  xpointer="SchWAIT"
+                  xpointer="xpointer(//*[@id='SchWAIT'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
   </chapter>
@@ -174,11 +174,11 @@
     in the ECL Standard Library Reference.</para>
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/MonitorFile.xml"
-                xpointer="MonitorFile"
+                xpointer="xpointer(//*[@id='MonitorFile'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="ECLStandardLibraryReference/SLR-Mods/MonitorLogicalFileName.xml"
-                xpointer="MonitorLogicalFileName"
+                xpointer="xpointer(//*[@id='MonitorLogicalFileName'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 </book>

docs/ECLStandardLibraryReference/CMakeLists.txt

@@ -15,3 +15,16 @@
 ################################################################################
 
 DOCBOOK_TO_PDF( ${FO_XSL} SLR-includer.xml "ECLStandardLibraryReference" "SLR-Mods")
+
+
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*ECLStandardLibraryReference.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+    ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/SLR-includer.xml" ${PORTAL_HTML_DIR}/SLR  "stdlib_ref_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/ECLStandardLibraryReference/SLR-includer.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">

docs/ECLWatch/CMakeLists.txt

@@ -18,3 +18,14 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} TheECLWatchMan.xml "The_ECL_Watch_Manual" "ECLWa_mods")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*The_ECL_Watch_Manual.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/TheECLWatchMan.xml" ${PORTAL_HTML_DIR}/ECLWatchMan  "eclwatch_man_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/ECLWatch/TheECLWatchMan.xml

@@ -42,15 +42,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -565,7 +565,7 @@
     </sect1>
 
     <xi:include href="ECLScheduler/ECLSched-Mods/ECLSchedComp.xml"
-                xpointer="ECLSched_Interface"
+                xpointer="xpointer(//*[@id='ECLSched_Interface'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <sect1>
@@ -672,11 +672,11 @@
     workunits there, but you can perform operations on workunits.</para>
 
     <xi:include href="ECLWatch/ECLWa_mods/ECLWatchSrc.xml"
-                xpointer="ECLWorkunits"
+                xpointer="xpointer(//*[@id='ECLWorkunits'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="ECLPlayground/ECLPlay-Mods/ECL_Playground.xml"
-                xpointer="ECL_Playground"
+                xpointer="xpointer(//*[@id='ECL_Playground'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 
@@ -695,15 +695,15 @@
     <!--  Might this be chapter for Xref?***-->
 
     <xi:include href="ECLWatch/ECLWa_mods/ECLWatchSrc.xml"
-                xpointer="ECLWatchLogicalFiles"
+                xpointer="xpointer(//*[@id='ECLWatchLogicalFiles'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="ECLWatch/ECLWa_mods/ECLWatchSrc.xml"
-                xpointer="DFUWorkunits"
+                xpointer="xpointer(//*[@id='DFUWorkunits'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="ECLWatch/ECLWa_mods/ECLWatchSrc.xml"
-                xpointer="Landing_Zones"
+                xpointer="xpointer(//*[@id='Landing_Zones'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <sect1 id="spray_and_despray">
@@ -742,42 +742,42 @@
       </sect2>
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="LZ_Spray"
+                  xpointer="xpointer(//*[@id='LZ_Spray'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="Spray_Fixed"
+                  xpointer="xpointer(//*[@id='Spray_Fixed'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="Spray_Delimited"
+                  xpointer="xpointer(//*[@id='Spray_Delimited'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="Spray_XML"
+                  xpointer="xpointer(//*[@id='Spray_XML'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="Spray_JSON"
+                  xpointer="xpointer(//*[@id='Spray_JSON'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="Spray_Variable"
+                  xpointer="xpointer(//*[@id='Spray_Variable'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="Spray_Blob"
+                  xpointer="xpointer(//*[@id='Spray_Blob'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="Desprays"
+                  xpointer="xpointer(//*[@id='Desprays'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml" xpointer="Copy"
+      <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml" xpointer="xpointer(//*[@id='Copy'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
 
       <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                  xpointer="Remote_Copy"
+                  xpointer="xpointer(//*[@id='Remote_Copy'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
 
@@ -981,7 +981,7 @@
     </figure>
 
     <xi:include href="ECLWatch/ECLWa_mods/ECLWatchQueries.xml"
-                xpointer="Queries_Page"
+                xpointer="xpointer(//*[@id='Queries_Page'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 
@@ -1322,11 +1322,11 @@
     </sect1>
 
     <xi:include href="HPCCCertify/Cert-Mods/CertPreflight.xml"
-                xpointer="Preflight_system_servers"
+                xpointer="xpointer(//*[@id='Preflight_system_servers'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCCertify/Cert-Mods/CertPreflight.xml"
-                xpointer="Preflight_Data_Refinery"
+                xpointer="xpointer(//*[@id='Preflight_Data_Refinery'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <!--
@@ -1341,7 +1341,7 @@
       from the ECL Watch interface.</para>
 
       <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/UserSecurityMaint.xml"
-                  xpointer="Sec_Adm_w_ECLWatch"
+                  xpointer="xpointer(//*[@id='Sec_Adm_w_ECLWatch'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1> 
  -->
@@ -1357,7 +1357,7 @@
       Watch.</para>
 
       <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/UserSecurityMaint.xml"
-                  xpointer="Sec_Adm_w_ECLWatch"
+                  xpointer="xpointer(//*[@id='Sec_Adm_w_ECLWatch'])"
                   xmlns:xi="http://www.w3.org/2001/XInclude" />
     </sect1>
   </chapter>
@@ -1453,7 +1453,7 @@
     </sect1>
 
     <xi:include href="HPCCMonitoring/MonRep-Mods/NagiosInECLWa.xml"
-                xpointer="Nagios_in_ECLWatch"
+                xpointer="xpointer(//*[@id='Nagios_in_ECLWatch'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 

docs/EclipseHelp/CMakeLists.txt

@@ -13,14 +13,17 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 ################################################################################
-set (ECLIPSE_HTML_DIR ${CMAKE_CURRENT_BINARY_DIR}/eclipse_html)
+IF(MAKE_DOCS)
+  set (ECLIPSE_HTML_DIR ${CMAKE_CURRENT_BINARY_DIR}/eclipse_html)
 
-GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
-SET(HELP_DEPENDENCIES)
-FOREACH(T ${Current_Targets})
-   IF("${T}" MATCHES ".*ECLReference.*")
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  SET(HELP_DEPENDENCIES)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*ECLReference.*")
       LIST(APPEND HELP_DEPENDENCIES  ${T})
-   ENDIF()
-ENDFOREACH()
+    ENDIF()
+  ENDFOREACH()
 
-DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} ${ECL_REFERENCE_XML} ${ECLIPSE_HTML_DIR})
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} ${ECL_REFERENCE_XML} ${ECLIPSE_HTML_DIR} "eclipse_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "doc_generate_html_zip")
+
+ENDIF(MAKE_DOCS)

docs/HPCCCertify/CMakeLists.txt

@@ -16,3 +16,15 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} certify.xml "HPCCCertification")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*HPCCCertification.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/certify.xml" ${PORTAL_HTML_DIR}/Certification  "certify_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)
+

docs/HPCCCertify/certify.xml

@@ -42,15 +42,15 @@ Date is used as the dateline/version number in the title page. The ID attribute
 Copyright is used for the copyright line on title page. The ID attribute is CopyRight--></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -191,14 +191,14 @@ Copyright is used for the copyright line on title page. The ID attribute is Copy
   </chapter>
 
   <xi:include href="HPCCCertify/Cert-Mods/CertPreflight.xml"
-              xpointer="Cert_Prelight"
+              xpointer="xpointer(//*[@id='Cert_Prelight'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="HPCCCertify/Cert-Mods/CertThorRox.xml"
-              xpointer="Generate_Certification_data_file"
+              xpointer="xpointer(//*[@id='Generate_Certification_data_file'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="HPCCCertify/Cert-Mods/CertSprayDespray.xml"
-              xpointer="Cert_Spray_Despray"
+              xpointer="xpointer(//*[@id='Cert_Spray_Despray'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>

docs/HPCCClientTools/CMakeLists.txt

@@ -18,3 +18,26 @@ DOCBOOK_TO_PDF( ${FO_XSL} ClientTools.xml "HPCCClientTools" "CT_Mods")
 
 DOCBOOK_TO_PDF( ${FO_XSL} TheECLIDEandHPCCClientTools.xml "TheECLIDEandHPCCClientTools" "CT_Mods")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*HPCCClientTools.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/ClientTools.xml" ${PORTAL_HTML_DIR}/ClientTools  "clienttools_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*TheECLIDEandHPCCClientTools.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/TheECLIDEandHPCCClientTools.xml" ${PORTAL_HTML_DIR}/ECLIDEandClientTools "eclide_clienttools_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+
+
+ENDIF(MAKE_DOCS)

docs/HPCCClientTools/ClientTools.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -59,24 +59,24 @@
   </bookinfo>
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_Overview_withoutIDE.xml"
-              xpointer="CT_Overview"
+              xpointer="xpointer(//*[@id='CT_Overview'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_Comm_Line_ECL.xml"
-              xpointer="Command_Line_ECL"
+              xpointer="xpointer(//*[@id='Command_Line_ECL'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="HPCCClientTools/CT_Mods/CT_ECL_CLI.xml" xpointer="ECL_CLI"
+  <xi:include href="HPCCClientTools/CT_Mods/CT_ECL_CLI.xml" xpointer="xpointer(//*[@id='ECL_CLI'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="HPCCClientTools/CT_Mods/ECLCC.xml" xpointer="ECL_Compiler"
+  <xi:include href="HPCCClientTools/CT_Mods/ECLCC.xml" xpointer="xpointer(//*[@id='ECL_Compiler'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_Comm_Line_DFU.xml"
-              xpointer="Command_Line_DFU"
+              xpointer="xpointer(//*[@id='Command_Line_DFU'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_ESDL_CLI.xml"
-              xpointer="ESDL_CLI" xmlns:xi="http://www.w3.org/2001/XInclude" />
+              xpointer="xpointer(//*[@id='ESDL_CLI'])" xmlns:xi="http://www.w3.org/2001/XInclude" />
               
 </book>

docs/HPCCClientTools/TheECLIDEandHPCCClientTools.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -59,26 +59,26 @@
   </bookinfo>
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_Overview.xml"
-              xpointer="CT_Overview"
+              xpointer="xpointer(//*[@id='CT_Overview'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_ECL_IDE.xml"
-              xpointer="The_ECL_Ide"
+              xpointer="xpointer(//*[@id='The_ECL_Ide'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_Comm_Line_ECL.xml"
-              xpointer="Command_Line_ECL"
+              xpointer="xpointer(//*[@id='Command_Line_ECL'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="HPCCClientTools/CT_Mods/CT_ECL_CLI.xml" xpointer="ECL_CLI"
+  <xi:include href="HPCCClientTools/CT_Mods/CT_ECL_CLI.xml" xpointer="xpointer(//*[@id='ECL_CLI'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-  <xi:include href="HPCCClientTools/CT_Mods/ECLCC.xml" xpointer="ECL_Compiler"
+  <xi:include href="HPCCClientTools/CT_Mods/ECLCC.xml" xpointer="xpointer(//*[@id='ECL_Compiler'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <xi:include href="HPCCClientTools/CT_Mods/CT_Comm_Line_DFU.xml"
-              xpointer="Command_Line_DFU"
+              xpointer="xpointer(//*[@id='Command_Line_DFU'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="HPCCClientTools/CT_Mods/CT_ESDL_CLI.xml"
-              xpointer="ESDL_CLI" xmlns:xi="http://www.w3.org/2001/XInclude" />
+              xpointer="xpointer(//*[@id='ESDL_CLI'])" xmlns:xi="http://www.w3.org/2001/XInclude" />
 </book>

docs/HPCCDataHandling/CMakeLists.txt

@@ -16,3 +16,14 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} DataHandling.xml "HPCCDataHandling" "DH-Mods")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*HPCCDataHandling.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/DataHandling.xml" ${PORTAL_HTML_DIR}/DataHandling "datahandling_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/HPCCDataHandling/DataHandling.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -128,19 +128,19 @@
     </sect1>
 
     <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                xpointer="Data_Handling_Terms"
+                xpointer="xpointer(//*[@id='Data_Handling_Terms'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                xpointer="Working_with_a_data_file"
+                xpointer="xpointer(//*[@id='Working_with_a_data_file'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                xpointer="Data_Handling_Methods"
+                xpointer="xpointer(//*[@id='Data_Handling_Methods'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCDataHandling/DH-Mods/DH-Mod1.xml"
-                xpointer="Data_Handling_Using_ECL-Watch"
+                xpointer="xpointer(//*[@id='Data_Handling_Using_ECL-Watch'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 

docs/HPCCDataTutorial/CMakeLists.txt

@@ -15,4 +15,14 @@
 ################################################################################
 
 DOCBOOK_TO_PDF( ${FO_XSL} DataTutorial.xml "HPCCDataTutorial")
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*HPCCDataTutorial.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
 
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/DataTutorial.xml" ${PORTAL_HTML_DIR}/DataTutorial  "data_tutorial_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/HPCCDataTutorial/DataTutorial.xml

@@ -42,21 +42,21 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <!--Release Info makes a running page footer: now an include! -->
 
     <!--The following include statement pulls in the date_ver from version.xml-->
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='DateVer'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <corpname>HPCC Systems<superscript>®</superscript></corpname>
 
     <!--corpname never prints-->
 
-    <xi:include href="common/Version.xml" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <!--Copyright tag inserts the symbol automatically: Now an Include!-->

docs/HPCCMonitoring/CMakeLists.txt

@@ -15,4 +15,14 @@
 ################################################################################
 
 DOCBOOK_TO_PDF( ${FO_XSL} HPCCMonitoringAndReporting.xml "HPCC_Monitoring_and_Reporting")
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*Monitoring_and_Reporting.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
 
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/HPCCMonitoringAndReporting.xml" ${PORTAL_HTML_DIR}/Monitoring_and_Reporting  "monitor_reporting_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/HPCCMonitoring/HPCCMonitoringAndReporting.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -1475,7 +1475,7 @@
     </sect1>
 
     <xi:include href="HPCCMonitoring/MonRep-Mods/NagiosInECLWa.xml"
-                xpointer="Nagios_in_ECLWatch"
+                xpointer="xpointer(//*[@id='Nagios_in_ECLWatch'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 </book>

docs/HPCCSystemAdmin/CMakeLists.txt

@@ -17,3 +17,25 @@
 DOCBOOK_TO_PDF( ${FO_XSL} HPCCSystemAdministratorsGuide.xml "HPCCSystemAdministratorsGuide" "SA-Mods")
 
 DOCBOOK_TO_PDF( ${FO_XSL} SecMgrInc.xml "HPCCSecurityManagerGuide" "SA-Mods")
+
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*SystemAdministratorsGuide.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/HPCCSystemAdministratorsGuide.xml" ${PORTAL_HTML_DIR}/SystemAdministratorsGuide  "system_administration_guide_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*SecurityManagerGuide.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/SecMgrInc.xml" ${PORTAL_HTML_DIR}/SecurityManagerGuide  "security_manager_guide_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/HPCCSystemAdmin/HPCCSystemAdministratorsGuide.xml

@@ -42,15 +42,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -427,19 +427,19 @@
     your specific enterprise needs.</para>
 
     <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/Hardware.xml"
-                xpointer="HW-Switch"
+                xpointer="xpointer(//*[@id='HW-Switch'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/Hardware.xml"
-                xpointer="HW-LoadBalancer"
+                xpointer="xpointer(//*[@id='HW-LoadBalancer'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/SysAdminConfigMod.xml"
-                xpointer="System_sizings"
+                xpointer="xpointer(//*[@id='System_sizings'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/Hardware.xml"
-                xpointer="Nodes-Software"
+                xpointer="xpointer(//*[@id='Nodes-Software'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 
@@ -1001,7 +1001,7 @@
   </chapter>
 
   <xi:include href="HPCCCertify/Cert-Mods/CertPreflight.xml"
-              xpointer="Cert_Prelight"
+              xpointer="xpointer(//*[@id='Cert_Prelight'])"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
 
   <chapter id="OnDemand_Maintenance">
@@ -1031,29 +1031,29 @@
     <!--/*Including special SysAdmin Config Module -paras- */-->
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/SysAdminConfigMod.xml"
-                xpointer="cfgmgr_introP0"
+                xpointer="xpointer(//*[@id='cfgmgr_introP0'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/SysAdminConfigMod.xml"
-                xpointer="cfgmgr_introP1"
+                xpointer="xpointer(//*[@id='cfgmgr_introP1'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/SysAdminConfigMod.xml"
-                xpointer="cfgmgr_p1b"
+                xpointer="xpointer(//*[@id='cfgmgr_p1b'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/SysAdminConfigMod.xml"
-                xpointer="cfgmgr_introP2"
+                xpointer="xpointer(//*[@id='cfgmgr_introP2'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/SysAdminConfigMod.xml"
-                xpointer="cfgmgr_introP3"
+                xpointer="xpointer(//*[@id='cfgmgr_introP3'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <!--/*Including special SysAdmin Config Module -Sect1- */-->
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/SysAdminConfigMod.xml"
-                xpointer="configuring-a-multi-node-system"
+                xpointer="xpointer(//*[@id='configuring-a-multi-node-system'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <sect1 id="SysAdm_Env.conf">
@@ -1227,7 +1227,7 @@ dfsSSLPrivateKeyFile=/keyfilepath/keyfile</programlisting>Set the <emphasis
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="Installing_and_RunningTheHPCCPlatform/Inst-Mods/UserSecurityMaint.xml"
-                xpointer="User_Security_Maint"
+                xpointer="xpointer(//*[@id='User_Security_Maint'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <sect1 id="SysAdm_WUs_ActiveDir">
@@ -1310,7 +1310,7 @@ dfsSSLPrivateKeyFile=/keyfilepath/keyfile</programlisting>Set the <emphasis
     </sect1>
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/CassandraWUServer.xml"
-                xpointer="CassandraWUStorage"
+                xpointer="xpointer(//*[@id='CassandraWUStorage'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <sect1 id="Redefining_Thor_Nodes">
@@ -1894,11 +1894,11 @@ heapUseTransparentHugePages</programlisting>
     </sect1>
 
     <xi:include href="RoxieReference/RoxieRefMods/RoxieCapacityPlanning.xml"
-                xpointer="Capacity_Planning"
+                xpointer="xpointer(//*[@id='Capacity_Planning'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <xi:include href="HPCCSystemAdmin/SA-Mods/SysAdminConfigMod.xml"
-                xpointer="Sample_Sizings"
+                xpointer="xpointer(//*[@id='Sample_Sizings'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 

docs/HPCCSystemAdmin/SecMgrInc.xml

@@ -34,15 +34,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">

docs/HTMLHelp/CMakeLists.txt

@@ -0,0 +1,26 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+set (HTML_HELP_DIR ${CMAKE_CURRENT_BINARY_DIR}/html_help)
+
+GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+SET(HELP_DEPENDENCIES)
+FOREACH(T ${Current_Targets})
+   IF("${T}" MATCHES ".*ECLReference.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+   ENDIF()
+ENDFOREACH()
+
+DOCBOOK_TO_HTML(${HTML_HELP_XSL} ${ECL_REFERENCE_XML} ${HTML_HELP_DIR} "html_help" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "doc_htmlhelp_zip")

docs/Installing_and_RunningTheHPCCPlatform/CMakeLists.txt

@@ -16,3 +16,14 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} Installing_and_RunningTheHPCCPlatform.xml "Installing_and_RunningTheHPCCPlatform")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*Installing_and_RunningTheHPCCPlatform.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/Installing_and_RunningTheHPCCPlatform.xml" ${PORTAL_HTML_DIR}/Installing_and_Running  "install_and_running_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/Installing_and_RunningTheHPCCPlatform/Installing_and_RunningTheHPCCPlatform.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">

docs/InstantCloud/CMakeLists.txt

@@ -14,4 +14,16 @@
 #    limitations under the License.
 ################################################################################
 
-DOCBOOK_TO_PDF( ${FO_XSL} InstantCloud.xml "InstantCloud_for_AWS")
+DOCBOOK_TO_PDF( ${FO_XSL} InstantCloud.xml "InstantCloud_for_AWS")
+
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*InstantCloud_for_AWS.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/InstantCloud.xml" ${PORTAL_HTML_DIR}/InstantCloud_for_AWS  "instantcloud_for_aws_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/InstantCloud/InstantCloud.xml

@@ -51,15 +51,15 @@
       <para><emphasis role="redbold"></emphasis></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='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="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">

docs/PortalHTML/CMakeLists.txt

@@ -0,0 +1,32 @@
+################################################################################
+#    HPCC SYSTEMS software Copyright (C) 2015 HPCC Systems(r).
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+################################################################################
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*_html")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+    ENDIF()
+  ENDFOREACH()
+  SET(PORTAL_HTML_ZIP "portal_html_zip")
+  ADD_CUSTOM_TARGET(${PORTAL_HTML_ZIP} ALL
+           COMMAND zip -r "portal_html.zip" ${PORTAL_HTML_DIR}
+           WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/
+           DEPENDS ${HELP_DEPENDENCIES}
+           )
+  set_property(GLOBAL APPEND PROPERTY DOC_TARGETS ${PORTAL_HTML_ZIP})
+
+ENDIF(MAKE_DOCS)

docs/RoxieReference/CMakeLists.txt

@@ -16,3 +16,14 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} RoxieReference.xml "RoxieReference" "RoxieRefMods" )
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*RoxieReference.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/RoxieReference.xml" ${PORTAL_HTML_DIR}/RoxieReference  "roxie_reference_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/RoxieReference/RoxieReference.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -872,7 +872,7 @@
 
 
      <xi:include href="RoxieReference/RoxieRefMods/RoxieCapacityPlanning.xml"
-                xpointer="Capacity_Planning"
+                xpointer="xpointer(//*[@id='Capacity_Planning'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
  
 
@@ -893,7 +893,7 @@
     <emphasis>HPCC System Administrator's Guide</emphasis>.</para>
 
     <xi:include href="HPCCCertify/Cert-Mods/CertPreflight.xml"
-                xpointer="Preflight_Roxie"
+                xpointer="xpointer(//*[@id='Preflight_Roxie'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <sect1 id="Roxie_Metrics">
@@ -1006,7 +1006,7 @@
     </sect1>
 
     <xi:include href="ECLWatch/ECLWa_mods/ECLWatchQueries.xml"
-                xpointer="Queries_Page"
+                xpointer="xpointer(//*[@id='Queries_Page'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
   </chapter>
 </book>

docs/RunningHPCCinaVirtualMachine/CMakeLists.txt

@@ -16,3 +16,14 @@
 
 DOCBOOK_TO_PDF( ${FO_XSL} RunningHPCCinaVirtualMachine.xml "RunningHPCCinaVirtualMachine")
 
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*RunningHPCCinaVirtualMachine.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/RunningHPCCinaVirtualMachine.xml" ${PORTAL_HTML_DIR}/VirtualMachine  "virtual_machine_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/RunningHPCCinaVirtualMachine/RunningHPCCinaVirtualMachine.xml

@@ -42,15 +42,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">

docs/UsingConfigManager/CMakeLists.txt

@@ -29,3 +29,15 @@ DOCBOOK_TO_PDF( ${FO_XSL} UsingConfigManager.xml "UsingConfigManager")
 #
 #
 ########################################################################
+
+IF(MAKE_DOCS)
+  SET(HELP_DEPENDENCIES)
+  GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
+  FOREACH(T ${Current_Targets})
+    IF("${T}" MATCHES ".*UsingConfigManager.*")
+      LIST(APPEND HELP_DEPENDENCIES  ${T})
+     ENDIF()
+  ENDFOREACH()
+
+  DOCBOOK_TO_HTML(${ECLIPSE_HTML_XSL} "${CMAKE_CURRENT_BINARY_DIR}/UsingConfigManager.xml" ${PORTAL_HTML_DIR}/UsingConfigManager  "using_configmgr_html" "${HPCC_SOURCE_DIR}/docs/common/eclipsehelp.css" "")
+ENDIF(MAKE_DOCS)

docs/UsingConfigManager/UsingConfigManager.xml

@@ -40,15 +40,15 @@
       <para></para>
     </legalnotice>
 
-    <xi:include href="common/Version.xml" xpointer="FooterInfo"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='FooterInfo'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
-    <xi:include href="common/Version.xml" xpointer="DateVer"
+    <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" xpointer="Copyright"
+    <xi:include href="common/Version.xml" xpointer="xpointer(//*[@id='Copyright'])"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <mediaobject role="logo">
@@ -750,7 +750,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/dali.xsd.mod.xml"
-                        xpointer="da.t1"
+                        xpointer="xpointer(//*[@id='da.t1'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -773,7 +773,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/dali.xsd.mod.xml"
-                        xpointer="da.t2"
+                        xpointer="xpointer(//*[@id='da.t2'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -793,7 +793,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/dali.xsd.mod.xml"
-                        xpointer="da.t4"
+                        xpointer="xpointer(//*[@id='da.t4'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -864,7 +864,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/dafilesrv.xsd.mod.xml"
-                        xpointer="daFs.t"
+                        xpointer="xpointer(//*[@id='daFs.t'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -912,7 +912,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/dfuserver.xsd.mod.xml"
-                        xpointer="DF.t1"
+                        xpointer="xpointer(//*[@id='DF.t1'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -930,7 +930,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/dfuserver.xsd.mod.xml"
-                        xpointer="DF.t2"
+                        xpointer="xpointer(//*[@id='DF.t2'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1124,7 +1124,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/eclagent_config.xsd.mod.xml"
-                        xpointer="EA.t1"
+                        xpointer="xpointer(//*[@id='EA.t1'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1142,7 +1142,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/eclagent_config.xsd.mod.xml"
-                        xpointer="EA.t2"
+                        xpointer="xpointer(//*[@id='EA.t2'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1201,7 +1201,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/eclccserver.xsd.mod.xml"
-                        xpointer="cc.t2"
+                        xpointer="xpointer(//*[@id='cc.t2'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1271,7 +1271,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/eclscheduler.xsd.mod.xml"
-                        xpointer="ecl.sched"
+                        xpointer="xpointer(//*[@id='ecl.sched'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1329,7 +1329,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/esp.xsd.mod.xml"
-                        xpointer="ESP.t6"
+                        xpointer="xpointer(//*[@id='ESP.t6'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1354,7 +1354,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/esp.xsd.mod.xml"
-                        xpointer="ESP.t1"
+                        xpointer="xpointer(//*[@id='ESP.t1'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
@@ -1365,7 +1365,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/esp.xsd.mod.xml"
-                        xpointer="ESP.t2"
+                        xpointer="xpointer(//*[@id='ESP.t2'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
@@ -1373,7 +1373,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
             <!--MyESP-Include-ES.t3-XXX-15-->
 
             <!-- <xi:include href="XMLGeneration/xml/esp.xsd.mod.xml"
-                        xpointer="ES.t3"
+                        xpointer="xpointer(//*[@id='ES.t3'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />  -->
           </para>
 
@@ -1396,7 +1396,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/esp.xsd.mod.xml"
-                        xpointer="ESP.t4"
+                        xpointer="xpointer(//*[@id='ESP.t4'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
@@ -1464,7 +1464,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/esp.xsd.mod.xml"
-                        xpointer="ESP.t5"
+                        xpointer="xpointer(//*[@id='ESP.t5'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1500,7 +1500,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/espsmcservice.xsd.mod.xml"
-                        xpointer="SMC-T01"
+                        xpointer="xpointer(//*[@id='SMC-T01'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
@@ -1510,7 +1510,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/espsmcservice.xsd.mod.xml"
-                        xpointer="SMC-T02"
+                        xpointer="xpointer(//*[@id='SMC-T02'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1531,7 +1531,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/esp_service_wsecl2.xsd.mod.xml"
-                        xpointer="MyWS2-T01"
+                        xpointer="xpointer(//*[@id='MyWS2-T01'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
@@ -1541,7 +1541,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/esp_service_wsecl2.xsd.mod.xml"
-                        xpointer="MyWS2-T02"
+                        xpointer="xpointer(//*[@id='MyWS2-T02'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
@@ -1551,7 +1551,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/esp_service_wsecl2.xsd.mod.xml"
-                        xpointer="MyWS2-T03"
+                        xpointer="xpointer(//*[@id='MyWS2-T03'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1615,7 +1615,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/ftslave_linux.xsd.mod.xml"
-                        xpointer="FTS.t1"
+                        xpointer="xpointer(//*[@id='FTS.t1'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1646,7 +1646,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
         <!--LdapServer-Include-fullDoc-XXX-19-->
 
         <xi:include href="XMLGeneration/xml/ldapserver.xsd.mod.xml"
-                    xpointer="ldapSrv"
+                    xpointer="xpointer(//*[@id='ldapSrv'])"
                     xmlns:xi="http://www.w3.org/2001/XInclude" />
 
         <sect3>
@@ -1725,7 +1725,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/sasha.xsd.mod.xml"
-                        xpointer="sh.t1"
+                        xpointer="xpointer(//*[@id='sh.t1'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1746,7 +1746,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/sasha.xsd.mod.xml"
-                        xpointer="sh.t2"
+                        xpointer="xpointer(//*[@id='sh.t2'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
 
@@ -1767,7 +1767,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/sasha.xsd.mod.xml"
-                        xpointer="sh.t3"
+                        xpointer="xpointer(//*[@id='sh.t3'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1788,7 +1788,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/sasha.xsd.mod.xml"
-                        xpointer="sh.t4"
+                        xpointer="xpointer(//*[@id='sh.t4'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1811,7 +1811,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/sasha.xsd.mod.xml"
-                        xpointer="sh.t5"
+                        xpointer="xpointer(//*[@id='sh.t5'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1832,7 +1832,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/sasha.xsd.mod.xml"
-                        xpointer="sh.t6"
+                        xpointer="xpointer(//*[@id='sh.t6'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -1853,7 +1853,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/sasha.xsd.mod.xml"
-                        xpointer="sh.t7"
+                        xpointer="xpointer(//*[@id='sh.t7'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -2096,7 +2096,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/thor.xsd.mod.xml"
-                        xpointer="Th.t1"
+                        xpointer="xpointer(//*[@id='Th.t1'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -2116,7 +2116,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/thor.xsd.mod.xml"
-                        xpointer="Th.t3"
+                        xpointer="xpointer(//*[@id='Th.t3'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>
@@ -2142,7 +2142,7 @@ sudo -u hpcc cp /etc/HPCCSystems/source/NewEnvironment.xml /etc/HPCCSystems/envi
 
           <para>
             <xi:include href="XMLGeneration/xml/thor.xsd.mod.xml"
-                        xpointer="Th.t4"
+                        xpointer="xpointer(//*[@id='Th.t4'])"
                         xmlns:xi="http://www.w3.org/2001/XInclude" />
           </para>
         </sect3>