1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152
|
--- 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()
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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>
|