Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-32104 Fix for xml:base issue with updated xml/xsl libraries #18797

Merged
merged 1 commit into from
Jun 24, 2024
Merged

HPCC-32104 Fix for xml:base issue with updated xml/xsl libraries #18797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions docs/BuildTools/cmake_config/HPCCSystemAdmin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" "")

Michael-Gardner marked this conversation as resolved.
Show resolved Hide resolved

SET(HELP_DEPENDENCIES)
GET_PROPERTY(Current_Targets GLOBAL PROPERTY DOC_TARGETS)
FOREACH(T ${Current_Targets})
Expand All @@ -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" "")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this being removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both of these files aren't needed anymore. Had discussions with @g-pan about fixing these issues and he informed me they shouldn't even be getting built. Greg has been investigating what needs to be removed in this jira https://hpccsystems.atlassian.net/browse/HPCC-31898.

ENDIF(MAKE_DOCS)
2 changes: 1 addition & 1 deletion docs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions docs/EN_US/ECLWatch/TheECLWatchMan.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
6 changes: 3 additions & 3 deletions docs/PT_BR/Installing_and_RunningTheHPCCPlatform/Inst-Mods/Hardware.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading