gnucash-docs maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Fri Jul 8 19:42:54 EDT 2022
Updated via https://github.com/Gnucash/gnucash-docs/commit/afef9670 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/59013c31 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/2422e674 (commit)
from https://github.com/Gnucash/gnucash-docs/commit/bdd42fe5 (commit)
commit afef9670092daeed882b7cc6d556342ab5dedf04
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 8 16:42:32 2022 -0700
Only build GHelp files by default on Unix-not-Apple
Windows and macOS don't have Yelp so it's not useful.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b8ac267..95a1488f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,7 +151,11 @@ if (WITH_HTML)
add_custom_target(html)
endif()
if (WITH_GHELP)
+ if (UNIX AND NOT APPLE)
add_custom_target(ghelp ALL)
+ else(UNIX AND NOT APPLE)
+ add_custom_target(ghelp)
+ endif()
endif()
if (WITH_PDF)
add_custom_target(pdf)
commit 59013c31d26c15ff56b0ee7afff49a57bb0d2bba
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 8 16:24:24 2022 -0700
Create ${DATADIR_BUILD}/gnome only when making the GHelp target.
diff --git a/cmake/AddGHelpTarget.cmake b/cmake/AddGHelpTarget.cmake
index fc623728..2a2dd422 100644
--- a/cmake/AddGHelpTarget.cmake
+++ b/cmake/AddGHelpTarget.cmake
@@ -11,8 +11,6 @@
function (add_ghelp_target docname lang entities figures)
set(BUILD_DIR "${DATADIR_BUILD}/gnome/help/${docname}/${lang}")
- file(MAKE_DIRECTORY "${BUILD_DIR}")
- file(MAKE_DIRECTORY "${BUILD_DIR}/figures")
set(source_files "")
foreach(xml_file ${entities} ${docname}.xml)
@@ -32,6 +30,12 @@ function (add_ghelp_target docname lang entities figures)
list(APPEND dest_files "${BUILD_DIR}/${xml_file}")
endforeach()
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ghelptrigger"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/figures")
+
+
add_custom_command(
OUTPUT ${dest_files}
COMMAND ${CMAKE_COMMAND} -E copy ${source_files} "${BUILD_DIR}"
@@ -39,7 +43,6 @@ function (add_ghelp_target docname lang entities figures)
WORKING_DIRECTORY "${BUILD_DIR}")
# Copy figures for this document
- file(MAKE_DIRECTORY "${BUILD_DIR}/figures")
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ghelp_figtrigger"
COMMAND ${CMAKE_COMMAND} -E copy ${figures} "${BUILD_DIR}/figures"
@@ -47,7 +50,8 @@ function (add_ghelp_target docname lang entities figures)
DEPENDS ${figures})
add_custom_target("${lang}-${docname}-ghelp"
- DEPENDS ${dest_files}
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ghelptrigger"
+ ${dest_files}
"${CMAKE_CURRENT_BINARY_DIR}/ghelp_figtrigger")
add_dependencies(${docname}-ghelp "${lang}-${docname}-ghelp")
commit 2422e674ade7ce3a38aa4af1fd3711bb59ab19b9
Author: John Ralls <jralls at ceridwen.us>
Date: Fri Jul 8 16:09:08 2022 -0700
Create ${DOCDIR_BUILD} only if one of the targets that needs it is built.
diff --git a/cmake/AddEpubTarget.cmake b/cmake/AddEpubTarget.cmake
index fdef2baf..6dfcb0d4 100644
--- a/cmake/AddEpubTarget.cmake
+++ b/cmake/AddEpubTarget.cmake
@@ -4,7 +4,6 @@ function (add_epub_target docname lang entities figures)
set(EPUB_TMPDIR "${CMAKE_CURRENT_BINARY_DIR}/epub")
set(BUILD_DIR "${DOCDIR_BUILD}/${lang}")
- file(MAKE_DIRECTORY "${BUILD_DIR}")
add_custom_command(
OUTPUT "${BUILD_DIR}/${epubfile}"
@@ -20,6 +19,7 @@ function (add_epub_target docname lang entities figures)
"${CMAKE_SOURCE_DIR}/xsl/1.79.2/epub/docbook.xsl"
"${CMAKE_CURRENT_SOURCE_DIR}/${docname}.xml"
COMMAND cmake -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/figures" "${EPUB_TMPDIR}/OEBPS/figures"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
COMMAND cd "${EPUB_TMPDIR}" && zip -X -r "${BUILD_DIR}/${epubfile}" mimetype META-INF OEBPS
DEPENDS ${entities} "${docname}.xml" "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd" ${figures})
diff --git a/cmake/AddHtmlTarget.cmake b/cmake/AddHtmlTarget.cmake
index a3efa23f..44dddd16 100644
--- a/cmake/AddHtmlTarget.cmake
+++ b/cmake/AddHtmlTarget.cmake
@@ -12,16 +12,16 @@ function (add_html_target docname lang entities figures)
set(styledir "${CMAKE_SOURCE_DIR}/stylesheet")
file(GLOB styleicons "${CMAKE_SOURCE_DIR}/stylesheet/*.png")
-
set(BUILD_DIR "${DOCDIR_BUILD}/${lang}/${docname}")
- file(MAKE_DIRECTORY "${BUILD_DIR}")
- file(MAKE_DIRECTORY "${BUILD_DIR}/figures")
- file(MAKE_DIRECTORY "${BUILD_DIR}/stylesheet")
+
# Convert xml to html with xsltproc
# xsltproc --xinclude -o outputdir/ /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl filename.xml
add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/htmltrigger"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/htmltrigger"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/figures"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}/stylesheet"
COMMAND ${XSLTPROC} ${XSLTPROCFLAGS} ${XSLTPROCFLAGS_HTML}
-o "${BUILD_DIR}/"
--param use.id.as.filename "1"
@@ -32,7 +32,6 @@ function (add_html_target docname lang entities figures)
DEPENDS ${entities} "${docname}.xml" "${CMAKE_SOURCE_DIR}/docbook/gnc-docbookx.dtd")
# Copy figures for this document
- file(MAKE_DIRECTORY "${BUILD_DIR}/figures")
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/html_figtrigger"
COMMAND ${CMAKE_COMMAND} -E copy ${figures} "${BUILD_DIR}/figures"
@@ -40,7 +39,6 @@ function (add_html_target docname lang entities figures)
DEPENDS ${figures})
# Copy style icons for this document (warning, info,...)
- file(MAKE_DIRECTORY "${BUILD_DIR}/stylesheet")
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/styletrigger"
COMMAND ${CMAKE_COMMAND} -E copy ${styleicons} "${BUILD_DIR}/stylesheet"
@@ -55,7 +53,7 @@ function (add_html_target docname lang entities figures)
add_dependencies(${docname}-html "${lang}-${docname}-html")
if(WITH_HTML_INSTALL)
- install(DIRECTORY ${BUILD_DIR}
+ install(TARGET "${lang}-${docname}-html"
DESTINATION "${CMAKE_INSTALL_DOCDIR}/${lang}")
endif()
endfunction()
diff --git a/cmake/AddPdfTarget.cmake b/cmake/AddPdfTarget.cmake
index 8bc34b84..cdb4ce6f 100644
--- a/cmake/AddPdfTarget.cmake
+++ b/cmake/AddPdfTarget.cmake
@@ -4,7 +4,6 @@ function (add_pdf_target docname lang entities figures)
set(pdffile "${docname}.pdf")
set(BUILD_DIR "${DOCDIR_BUILD}/${lang}")
- file(MAKE_DIRECTORY "${BUILD_DIR}")
# Determine paper format depending on language (which maps to the document's directory name)
# * for language "C" (fallback language) determine paper format based on current locale
@@ -21,6 +20,7 @@ function (add_pdf_target docname lang entities figures)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${fofile}"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${BUILD_DIR}"
COMMAND ${XSLTPROC} ${XSLTPROCFLAGS} ${XSLTPROCFLAGS_FO}
-o "${CMAKE_CURRENT_BINARY_DIR}/${fofile}"
--stringparam fop1.extensions 1
Summary of changes:
CMakeLists.txt | 4 ++++
cmake/AddEpubTarget.cmake | 2 +-
cmake/AddGHelpTarget.cmake | 12 ++++++++----
cmake/AddHtmlTarget.cmake | 14 ++++++--------
cmake/AddPdfTarget.cmake | 2 +-
5 files changed, 20 insertions(+), 14 deletions(-)
More information about the gnucash-changes
mailing list