Skip to content

Commit

Permalink
fix document generation on fedora (GPSBabel#949)
Browse files Browse the repository at this point in the history
* try to find common docbook url for fedora/ubuntu/homebrew catalogs.

* fedora builds

jing is broken on f32, remove it so it doesn't kill our document build.

add f37, with Qt5 because fedora doesn't have Qt6 webengine yet.
  • Loading branch information
tsteven4 authored Nov 24, 2022
1 parent 39e3dee commit 757b5c7
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
# version 32, though obsolete, uses Qt 5.14 so we keep it for that.
version: ['32', '35']
version: ['32', '35', '37']
container:
image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.version }}
env:
Expand Down
2 changes: 1 addition & 1 deletion tools/Dockerfile_f32
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN dnf install --assumeyes libusbx-devel zlib-devel shapelib-devel && \
RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
dnf clean all
# tools to build the docs
RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl jing && \
RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
dnf clean all
# create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100
2 changes: 1 addition & 1 deletion tools/Dockerfile_f35
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
dnf clean all
# tools to build the docs
RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl && \
RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
dnf clean all
# create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100
22 changes: 22 additions & 0 deletions tools/Dockerfile_f37
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# this file is used to build the image gpsbabel_build_environment used by travis.

FROM fedora:37

LABEL maintainer="https://github.com/tsteven4"

WORKDIR /app

# basic tools to build
RUN dnf install --assumeyes git make valgrind diffutils findutils langpacks-en ninja-build && \
dnf clean all
# libraries used by gpsbabel. zlib and shapelib may or may not be used depending qmake options.
RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
dnf clean all
# Qt used by gpsbabel, gpsbabelfe
RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
dnf clean all
# tools to build the docs
RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop docbook5-style-xsl docbook5-schemas && \
dnf clean all
# create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100
4 changes: 2 additions & 2 deletions tools/make_gpsbabel_doc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
set -ex

perl xmldoc/makedoc
xmllint --noout --relaxng http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng xmldoc/readme.xml
xmllint --noout --relaxng http://docbook.org/xml/5.0/rng/docbook.rng xmldoc/readme.xml
# the following doesn't seem to work.
#xmllint --noout --schematron http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch xmldoc/readme.xml
#xmllint --noout --schematron http://docbook.org/xml/5.0/sch/docbook.sch xmldoc/readme.xml
# jing and many depedencies removed from fedora
if command -v jing >/dev/null 2>&1; then
jing http://docs.oasis-open.org/docbook/xml/5.0/rng/docbook.rng xmldoc/readme.xml
Expand Down

0 comments on commit 757b5c7

Please sign in to comment.