From: Debian GPS team Date: Sat, 11 Jan 2025 07:01:10 +0000 (+0100) Subject: htmldoc-location X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=10badc833ed9016e8ea0c3eb64e344ca4324c6bb;p=gpsbabel.git htmldoc-location Gbp-Pq: Name htmldoc-location --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e6fa520bf..a3b042fbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -484,8 +484,6 @@ if(UNIX AND NOT APPLE) USES_TERMINAL) endif() -get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) -if((CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) AND NOT _isMultiConfig) set(GPSBABEL_WEB "gpsbabel.org" CACHE PATH "Path where the documentation will be stored for www.gpsbabel.org.") add_custom_target(gpsbabel.org ${CMAKE_SOURCE_DIR}/tools/make_gpsbabel_org.sh ${GPSBABEL_WEB} ${GPSBABEL_DOCVERSION} @@ -504,6 +502,3 @@ if((CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) AND NOT _isMultiConfig) DEPENDS gpsbabel VERBATIM USES_TERMINAL) -else() - message(WARNING "Document generation is only supported for in-source builds with single configuration generators.") -endif() diff --git a/gbversion.h.in b/gbversion.h.in index cb3419d67..d47263bd8 100644 --- a/gbversion.h.in +++ b/gbversion.h.in @@ -16,5 +16,5 @@ #define VERSION "@GB.MAJOR@.@GB.MINOR@.@GB.MICRO@@GB.PACKAGE_RELEASE@" constexpr char kVersionSHA[] = "@GB.SHA@"; constexpr char kVersionDate[] = "@GB.DATE@"; -#define WEB_DOC_DIR "https://www.gpsbabel.org/htmldoc-@GPSBABEL_DOCVERSION@" +#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/html" #endif diff --git a/testo.d/serialization.test b/testo.d/serialization.test index 3eadff6a0..f09f1e4eb 100644 --- a/testo.d/serialization.test +++ b/testo.d/serialization.test @@ -7,7 +7,7 @@ # the GUI and the document. # We do a compare_nole as specific whitespace is part of deserialization. gpsbabel -^3 > ${TMPDIR}/format3.txt -sed 's,https://www.gpsbabel.org/htmldoc-.[^/]*/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/format3.txt >${TMPDIR}/format3.fiddled.txt +sed 's,file:///usr/share/doc/gpsbabel/html/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/format3.txt >${TMPDIR}/format3.fiddled.txt compare_nole ${REFERENCE}/format3.txt ${TMPDIR}/format3.fiddled.txt gpsbabel -^2 > ${TMPDIR}/format2.txt compare_nole ${REFERENCE}/format2.txt ${TMPDIR}/format2.txt @@ -16,7 +16,7 @@ compare_nole ${REFERENCE}/format1.txt ${TMPDIR}/format1.txt gpsbabel -^0 > ${TMPDIR}/format0.txt compare_nole ${REFERENCE}/format0.txt ${TMPDIR}/format0.txt gpsbabel -%1 > ${TMPDIR}/filter1.txt -sed 's,https://www.gpsbabel.org/htmldoc-.[^/]*/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/filter1.txt >${TMPDIR}/filter1.fiddled.txt +sed 's,file:///usr/share/doc/gpsbabel/html/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/filter1.txt >${TMPDIR}/filter1.fiddled.txt compare_nole ${REFERENCE}/filter1.txt ${TMPDIR}/filter1.fiddled.txt gpsbabel -%0 > ${TMPDIR}/filter0.txt compare_nole ${REFERENCE}/filter0.txt ${TMPDIR}/filter0.txt diff --git a/tools/make_gpsbabel_doc.sh b/tools/make_gpsbabel_doc.sh index 61b8dcb93..ebde3795a 100755 --- a/tools/make_gpsbabel_doc.sh +++ b/tools/make_gpsbabel_doc.sh @@ -1,8 +1,8 @@ #!/bin/sh set -ex -perl xmldoc/makedoc -xmllint --noout --relaxng http://docbook.org/xml/5.0/rng/docbook.rng xmldoc/readme.xml +perl ../xmldoc/makedoc +xmllint --noout --relaxng /usr/share/xml/docbook/stylesheet/docbook-xsl/slides/schema/relaxng/docbook.rng ../xmldoc/readme.xml # the following doesn't seem to work. #xmllint --noout --schematron http://docbook.org/xml/5.0/sch/docbook.sch xmldoc/readme.xml # jing and many depedencies removed from fedora diff --git a/tools/make_gpsbabel_org.sh b/tools/make_gpsbabel_org.sh index 0eb9d0f96..ff15bb379 100755 --- a/tools/make_gpsbabel_org.sh +++ b/tools/make_gpsbabel_org.sh @@ -5,13 +5,10 @@ web=${1:-gpsbabel.org} docversion=${2:-x.y.z} tooldir=$(cd "$(dirname "$0")" && pwd) -mkdir -p "${web}/htmldoc-${docversion}" +mkdir -p "html" "$tooldir"/make_gpsbabel_doc.sh xsltproc \ - --stringparam base.dir "${web}/htmldoc-${docversion}/" \ + --stringparam base.dir "html" \ --stringparam root.filename "index" \ - xmldoc/babelmain.xsl \ - xmldoc/readme.xml -"${tooldir}"/fixdoc "${web}/htmldoc-${docversion}" "GPSBabel ${docversion}:" -"${tooldir}"/mkcapabilities "${web}" "${web}/htmldoc-${docversion}" -cp gpsbabel.pdf "${web}/htmldoc-${docversion}/gpsbabel-${docversion}.pdf" + ../xmldoc/babelmain.xsl \ + ../xmldoc/readme.xml diff --git a/tools/make_gpsbabel_pdf.sh b/tools/make_gpsbabel_pdf.sh index abe7a560b..4be4135ba 100755 --- a/tools/make_gpsbabel_pdf.sh +++ b/tools/make_gpsbabel_pdf.sh @@ -4,5 +4,5 @@ set -ex tooldir=$(cd "$(dirname "$0")" && pwd) "$tooldir"/make_gpsbabel_doc.sh -xsltproc -o gpsbabel.fo xmldoc/babelpdf.xsl xmldoc/readme.xml +xsltproc -o gpsbabel.fo ../xmldoc/babelpdf.xsl ../xmldoc/readme.xml HOME=. fop -q -fo gpsbabel.fo -pdf gpsbabel.pdf diff --git a/xmldoc/babelmain.xsl b/xmldoc/babelmain.xsl index 60eaa3322..6a5660f1f 100644 --- a/xmldoc/babelmain.xsl +++ b/xmldoc/babelmain.xsl @@ -4,7 +4,7 @@ exclude-result-prefixes="exsl"> - + 1 1 @@ -45,13 +45,11 @@ - {extends file="main.tpl"} - {block name=body}{literal} @@ -73,7 +71,6 @@ - {/literal}{/block} diff --git a/xmldoc/babelpdf.xsl b/xmldoc/babelpdf.xsl index c80ec321b..1dc0e895b 100644 --- a/xmldoc/babelpdf.xsl +++ b/xmldoc/babelpdf.xsl @@ -6,7 +6,7 @@ exclude-result-prefixes="exsl"> - +