gnucash-docs maint: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Sun Nov 28 18:46:15 EST 2021
Updated via https://github.com/Gnucash/gnucash-docs/commit/69ae9490 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/f80fe5dc (commit)
from https://github.com/Gnucash/gnucash-docs/commit/9d2b4e95 (commit)
commit 69ae9490dc4b1d06ce0c56e24fc85fcc15f9b1f9
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Nov 29 00:04:39 2021 +0100
Remove several Autotools remains
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20ef3d64..84336bd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,8 @@ unset(dist_files CACHE)
# ############################################################
# These options are settable from the CMake command line. For example,
# to enable mobi, put -D WITH_MOBI=ON on the command line.
-# To mimic the autotools' behaviour the targets enabled by default
-# are different for Windows vs the other supported platforms.
+# The targets enabled by default are different for Windows vs.
+# the other supported platforms.
# On windows only chm is enabled by default
# On any other platform chm and mobi are disabled by default
@@ -88,20 +88,6 @@ if(NOT XMLLINT)
message(SEND_ERROR "Can't find xmllint, perhaps you should install the xsltproc or libxslt package ?")
endif(NOT XMLLINT)
-# Find a proper bash executable, only used in case of distcheck with autotools
-set(GNC_SHELL $ENV{GNC_SHELL})
-if (GNC_SHELL) # Replacing this with if ($ENV{GNC_SHELL}) doesn't work.
- # Allow shell override by setting the GNC_SHELL environment variable
- set(SHELL ${GNC_SHELL})
-else()
- find_package(UnixCommands)
- if (BASH)
- set(SHELL ${BASH})
- else()
- message(SEND_ERROR "Can't find a suitable bash executable. Please set GNC_SHELL.")
- endif()
-endif()
-
# Check for optional fop
if(WITH_PDF)
find_program(FOP fop)
diff --git a/README b/README
index 58c3b78e..072d8adf 100644
--- a/README
+++ b/README
@@ -10,7 +10,8 @@ DocBook v4.5 (not 5.x series) they can be accessed under
* after conversion:
** MacOs: html
** Windows: chm
-** mobile devices: mobi, epub
+** mobiles: mobi
+** eBook readers: epub
** paper: pdf
If you wish to obtain a copy of the documentation in one of the latter formats,
@@ -29,7 +30,7 @@ Requirements
* docbook-dtds
* yelp (for viewing)
-Optional:
+Optional for ranslators:
* gnome-doc-utils (contains xml2po for the use of po editors like in the italian translation)
Additional Requirements for Generating Mobipocket:
@@ -147,12 +148,11 @@ languages.
depending on the output format you require.
-* running xmllint
+* Running syntax checks by xmllint
-----------------
You can also run xmllint on all documents or a specific document with the command
- make check # for toplevel check or (autotools only) per document check in
- # the respective subdirectories
+ make check # for toplevel check
make de-gnucash-help-check # for a cmake check for one specific document
# in this example - the German help guide
diff --git a/guide/ja/CMakeLists.txt b/guide/ja/CMakeLists.txt
index 543ff529..17c014f5 100644
--- a/guide/ja/CMakeLists.txt
+++ b/guide/ja/CMakeLists.txt
@@ -22,11 +22,6 @@ set (entities
appendixd.xml)
set (FOP_XCONF "${CMAKE_CURRENT_SOURCE_DIR}/fop.xconf.in")
-# Compatibility hack for autotools
-# When autotools gets dropped this line can be removed
-# and CMAKE_CURRENT_SOURCE_DIR can be used directly in
-# fop.xconf.in
-set(BASEDIR_JA "${CMAKE_CURRENT_SOURCE_DIR}")
add_gnc_doc_targets(${docname} "${entities}")
diff --git a/guide/ja/fop.xconf.in b/guide/ja/fop.xconf.in
index 9e234c04..91a4c073 100644
--- a/guide/ja/fop.xconf.in
+++ b/guide/ja/fop.xconf.in
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<fop version="1.0">
- <!-- BASEDIR_JA can be replaced with CMAKE_CURRENT_SOURCE_DIR
- once we completely drop the autotools build system -->
- <base>@BASEDIR_JA@</base>
+ <base>@CMAKE_CURRENT_SOURCE_DIR@</base>
<font-base>@japanese_fontdir@</font-base>
<!-- Information for specific renderers -->
diff --git a/guide/ru/CMakeLists.txt b/guide/ru/CMakeLists.txt
index d8fcd11e..1c7d6e39 100644
--- a/guide/ru/CMakeLists.txt
+++ b/guide/ru/CMakeLists.txt
@@ -24,11 +24,6 @@ set (entities
appendixd.xml)
set (FOP_XCONF "${CMAKE_CURRENT_SOURCE_DIR}/fop.xconf.in")
-# Compatibility hack for autotools
-# When autotools gets dropped this line can be removed
-# and CMAKE_CURRENT_SOURCE_DIR can be used directly in
-# fop.xconf.in
-set(BASEDIR_RU "${CMAKE_CURRENT_SOURCE_DIR}")
add_gnc_doc_targets(${docname} "${entities}")
diff --git a/guide/ru/fop.xconf.in b/guide/ru/fop.xconf.in
index 53a87c68..d8462a28 100644
--- a/guide/ru/fop.xconf.in
+++ b/guide/ru/fop.xconf.in
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<fop version="1.0">
- <!-- BASEDIR_RU can be replaced with CMAKE_CURRENT_SOURCE_DIR
- once we completely drop the autotools build system -->
- <base>@BASEDIR_RU@</base>
+ <base>@CMAKE_CURRENT_SOURCE_DIR@</base>
<font-base>@extended_fontdir@</font-base>
<!-- Information for specific renderers -->
commit f80fe5dcc5daba583411e19f2c31f465337a22c6
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Nov 29 00:03:10 2021 +0100
Drop CI
We are using Github Workflows now.
diff --git a/util/ci/afterfailure b/util/ci/afterfailure
deleted file mode 100755
index 9cbd0ff0..00000000
--- a/util/ci/afterfailure
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [[ "$BUILDTYPE" == "cmake-make" ]] || [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
- echo "########################";
- echo "##### LastTest.log #####";
- echo "########################";
- cat /build/Testing/Temporary/LastTest.log;
-elif [[ "$BUILDTYPE" == "autotools-make" ]]; then
- echo "##################################";
- echo "##### See error output above #####";
- echo "##################################";
-else
- echo "Unknown BUILDTYPE: \"$BUILDTYPE\", cannot create failure information.";
-fi
-# This script should fail so that the entire script will fail.
-exit 1;
diff --git a/util/ci/commonbuild b/util/ci/commonbuild
deleted file mode 100644
index f5c15704..00000000
--- a/util/ci/commonbuild
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-
-mkdir -p "$HOME"/.local/share
-
-if [[ "$BUILDTYPE" == "autotools-make" ]]; then
- cd gnucash-docs
- ./autogen.sh
- cd ..
-fi
-
-mkdir build
-cd build
-export TZ="America/Los_Angeles"
-
-if [[ "$BUILDTYPE" == "autotools-make" ]]; then
- ../gnucash-docs/configure
- make -j 4
- make check || ../afterfailure
-else
- echo "Unknown buildtype: \"$BUILDTYPE\". Not building."
-fi
-
diff --git a/util/ci/ubuntu-18.04-docker b/util/ci/ubuntu-18.04-docker
deleted file mode 100644
index d02d2034..00000000
--- a/util/ci/ubuntu-18.04-docker
+++ /dev/null
@@ -1,7 +0,0 @@
-from ubuntu:18.04
-run apt-get update -qq
-run apt-get install -qq git bash-completion make xsltproc libxml2-utils autoconf libtool > /dev/null
-run apt-get --reinstall install -qq language-pack-en language-pack-fr
-copy ubuntu-18.04-testscript afterfailure commonbuild /
-run chmod +x /ubuntu-18.04-testscript /afterfailure /commonbuild
-entrypoint /ubuntu-18.04-testscript
diff --git a/util/ci/ubuntu-18.04-testscript b/util/ci/ubuntu-18.04-testscript
deleted file mode 100644
index 039784a1..00000000
--- a/util/ci/ubuntu-18.04-testscript
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -e
-
-# -e above so that if any command has an exit code != 0, this script will
-# exit immediately.
-
-../commonbuild
Summary of changes:
CMakeLists.txt | 18 ++----------------
README | 10 +++++-----
guide/ja/CMakeLists.txt | 5 -----
guide/ja/fop.xconf.in | 4 +---
guide/ru/CMakeLists.txt | 5 -----
guide/ru/fop.xconf.in | 4 +---
util/ci/afterfailure | 16 ----------------
util/ci/commonbuild | 22 ----------------------
util/ci/ubuntu-18.04-docker | 7 -------
util/ci/ubuntu-18.04-testscript | 6 ------
10 files changed, 9 insertions(+), 88 deletions(-)
delete mode 100755 util/ci/afterfailure
delete mode 100644 util/ci/commonbuild
delete mode 100644 util/ci/ubuntu-18.04-docker
delete mode 100644 util/ci/ubuntu-18.04-testscript
More information about the gnucash-changes
mailing list