htmldoc-location

Gbp-Pq: Name htmldoc-location

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6fa520bf8886dc610d85739ef9d0ee03cd77b04..a3b042fbf092ca0eebe0b9bb3acdeeb1e746dabf 100644 (file)
--- 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 cb3419d67e73e53fb11957b6952fcd0e223654bd..d47263bd8e93946c47ac7cc2288b3453477d9bed 100644 (file)
--- 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 3eadff6a014b18d70bf6b832e63d363fd03ce06a..f09f1e4eb7b8769915f2bdc3f9179b467d4cdfc1 100644 (file)
--- 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 61b8dcb93da01e357b63340c52db6ae63d6c1586..ebde3795a0cb3029bd40c60720121469a6c481d1 100755 (executable)
--- 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 0eb9d0f96eee7c779b3b26bbcb7ab6660102164f..ff15bb3794c136a039c1fe7077658566ea868177 100755 (executable)
--- 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 abe7a560ba0caf0a7f06978bae5fb9c657514e60..4be4135ba41524692032572e217cf4d864a48989 100755 (executable)
--- 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 60eaa3322cb6c8de4eb59d93973fb53ce5494c41..6a5660f1ff875d975ce130e9f2c1c5d8ce4c9f82 100644 (file)
--- a/xmldoc/babelmain.xsl
+++ b/xmldoc/babelmain.xsl
@@ -4,7 +4,7 @@
                 exclude-result-prefixes="exsl">
 
 
-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/xhtml/chunk.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/chunk.xsl"/>
 
 <xsl:param name="use.id.as.filename">1</xsl:param>
 <xsl:param name="chunk.first.sections">1</xsl:param>
@@ -45,13 +45,11 @@
     <xsl:apply-imports/>
   </xsl:param>
 
-  {extends file="main.tpl"}
     <xsl:call-template name="html.head">
       <xsl:with-param name="prev" select="$prev"/>
       <xsl:with-param name="next" select="$next"/>
     </xsl:call-template>
       <xsl:call-template name="body.attributes"/>
-  {block name=body}{literal}
                       <xsl:call-template name="user.header.navigation"/>
 
                       <xsl:call-template name="header.navigation">
@@ -73,7 +71,6 @@
                       </xsl:call-template>
 
                       <xsl:call-template name="user.footer.navigation"/>
-      {/literal}{/block}
   <xsl:value-of select="$chunk.append"/>
 </xsl:template>
 

diff --git a/xmldoc/babelpdf.xsl b/xmldoc/babelpdf.xsl
index c80ec321bf54b36ee2d154c852b620105ef844b1..1dc0e895bee231df4e990ce8e3d721fb712edbb4 100644 (file)
--- a/xmldoc/babelpdf.xsl
+++ b/xmldoc/babelpdf.xsl
@@ -6,7 +6,7 @@
                 exclude-result-prefixes="exsl">
 
 
-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/fo/docbook.xsl"/>
+<xsl:import href="file:///usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl"/>
 
 <!-- turn on extensions for newer versions of fop.  In particular, this makes
      the XSL generate an fo bookmark-tree, which fop translates into bookmarks

diff --git a/xmldoc/gpsbabel_man.xml b/xmldoc/gpsbabel_man.xml
index a23e7b44f130b043a3560e45099897680e93cb10..12735ca8b78ee897d43370ae0c1a3df90d1421b7 100644 (file)
--- a/xmldoc/gpsbabel_man.xml
+++ b/xmldoc/gpsbabel_man.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE refentry
   PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
-  'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
+  'file:///usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd'>
 <refentry id="gpsbabel">
   <refentryinfo>
     <author>
@@ -127,7 +127,7 @@ or as the backend for other tools. </para>
         </listitem>
       </varlistentry>
     </variablelist>
-    <para>Lists of filters and formats are given in the doc at https://www.gpsbabel.org. </para>
+    <para>Lists of filters and formats are given in the doc at /usr/share/doc/gpsbabel/. </para>
   </refsect1>
   <refsect1>
     <title>See Also</title>