gnucash-docs master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Sep 8 15:32:56 EDT 2019
Updated via https://github.com/Gnucash/gnucash-docs/commit/c52384e7 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/73beb776 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/b7619e03 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/9f9e20f6 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/67f0c717 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/12ff0d04 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/50a06ccd (commit)
via https://github.com/Gnucash/gnucash-docs/commit/9899639b (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ac183ad9 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/ee29380c (commit)
via https://github.com/Gnucash/gnucash-docs/commit/715f7fa0 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/8cec38d5 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/2c6180f5 (commit)
from https://github.com/Gnucash/gnucash-docs/commit/c1ae6d7b (commit)
commit c52384e78dc4f7b471129c7c27cf18c18e6fcb36
Merge: c1ae6d7 73beb77
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 8 12:32:38 2019 -0700
Merge branch 'maint'
commit 73beb776ae77e5354f9602dda8921d15181ff75c
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Sep 8 12:31:20 2019 -0700
Fix the cmake dist dependencies in the autotools build.
commit b7619e039ad2a0f0dda0ece81294b1cae08582f7
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Sep 7 17:35:31 2019 -0700
Release Documentation for GnuCash 3.7.
commit 9f9e20f623063a0840d40c9eb1a11adcc856038a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Sep 7 15:42:19 2019 +0200
CMake - update installation components
Installation is normally only done in preparation of packaging the docs.
At that point one would want to install all documents in a given format
at once. So make the installation components document name independent.
There are now two components: ghelp and chm. One for integration on linux
into the gnome help system and one for integration on Windows.
All other document types don't define installation targets so no other
components for installation are defined either.
commit 67f0c71751da67d324cde31ce11e4217b6d7d5e6
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Sep 7 12:22:11 2019 +0200
CMake - revisit image handling
- replace variable figdir with the hardcoded valude 'figures'. We don't
need that much flexibility in defining where the images are stored.
- determine list of images on a higher level so we don't have to copy
the same code in each target function. Note there are two
function calls to determine the list of images: one to use in the
target functions (with absolute paths) and one to use for the
dist target (with pathnames relative to the current source directory)
commit 12ff0d04151c1ecdac26dc30a320afd1c11344ee
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Sep 7 11:43:06 2019 +0200
CMake - revisit xml target
This is really a target to install the documentation where gnome help
searches for it rather than some generic xml target. Rename the
target to ghelp to make this more explicit.
In addition add rules to 'install' in the build directory just like
all the other targets. The real install target is also kept as
this is what distro packagers will be using eventually.
Lastly, move the check target to a separate location as it's not
ghelp specific. It is used to run xmllint on the source files
which would benefit all document formats. It has been made optional
though as calling 'make check' will always run the check. Setting
it as dependency for other targets would in turn cause the other
targets to always rebuild even if no source files were changed.
commit 50a06ccd1f391064b202efd92597610ea087e98d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Sep 7 10:40:17 2019 +0200
CMake - refactor targets into custom commands
A custom target will always run its commands. However we only want
to run the commands if one of the dependencies changes. This is
exactly how custom commands work. A custom target is still defined as well
for each document/lang/format triplet as that is needed for dependency
management across directories and to have a direct target to pass to make
Note for the html target(s) this posed a challenge. When cmake is run
to set up the build system it is unknown still what the final html files
will be for the html targets so it's impossible to add dependencies at
set up time. Instead a dummy file is created when the html build rule
is run. Whenever any of the dependencies is newer than this dummy file
the build rule will be triggered.
commit 9899639bd32b9e369da978bf1b026ff51145e248
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Sep 6 19:48:57 2019 +0200
CMake - Define options to enable or disable document formats
The defaults depend on the target platform
- Windows: only the chm format is enabled by default
- Other: all but chm and mobi formats are enabled by default
commit ac183ad9135f62d36cdaff7111926abee0a4feb3
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Sep 6 19:13:26 2019 +0200
CMake - Add uninstall target
commit ee29380ca75fb3af0b559a578271aea289de7252
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Sep 6 19:03:15 2019 +0200
CMake - revisit build and install file locations
- add install rules only for xml (gnome-help) and chm (windows help).
For the other documentation formats there's not much use as they
are not typically installed
- at build time mimic the install locations. That is all final documents
that we build will be stored under BUILD_DIR/share/doc/gnucash-docs/LANG
You will find there a directory for the html format and the final documents
for the other formats (pdf, chm, epub, mobi)
- files that are only needed to build the end document formats will
remain in the traditional build directories
(BUILDDIR/guide/LANG and BUILDDIR/help/LANG)
These are for example the intermediate fo file (which is used
for final pdf generation), the fop xconf file, a temporary directory
used for epub generation,...
commit 715f7fa0e69b33b079f1b847cfe009147bcae398
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 4 22:07:49 2019 +0200
CMake - add chm target for windows documentation
commit 8cec38d55670d2858332d48db06287f4596533cf
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 4 16:14:06 2019 +0200
CMake - Use xslt parameter to set chm file name
commit 2c6180f5ba509e2ce13a040f59f6abba28b141f9
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Sep 4 15:13:50 2019 +0200
CMake - Rename cmake modules for clarity
This also moves the html rules to a separate file
Summary of changes:
CMakeLists.txt | 121 +++++++++++++++-------
CMakeNotes.txt | 3 +-
ChangeLog | 164 ++++++++++++++++++++++++++++++
Makefile.am | 18 ++--
NEWS | 7 ++
chm.make | 3 +-
cmake/AddChmTarget.cmake | 37 +++++++
cmake/{epub.cmake => AddEpubTarget.cmake} | 35 ++++---
cmake/AddGHelpTarget.cmake | 54 ++++++++++
cmake/AddGncDocTargets.cmake | 57 +++++++++++
cmake/AddHtmlTarget.cmake | 57 +++++++++++
cmake/{pdf.cmake => AddPdfTarget.cmake} | 20 ++--
cmake/{dist.cmake => DistCommon.cmake} | 0
cmake/MakeChm.cmake | 69 +++++++++++++
cmake/MakeDist.cmake | 2 +-
cmake/MakeDistCheck.cmake | 2 +-
cmake/cmake_uninstall.cmake.in | 23 +++++
cmake/gnc_doc_targets.cmake | 33 ------
cmake/xmldocs.cmake | 108 --------------------
docbook/gnc-docbookx.dtd | 6 +-
guide/C/gnucash-guide.xml | 12 ++-
guide/CMakeLists.txt | 31 ++++--
guide/de/gnucash-guide.xml | 12 ++-
guide/it/gnucash-guide.xml | 8 ++
guide/pt/gnucash-guide.xml | 10 +-
guide/ru/gnucash-guide.xml | 12 ++-
help/C/gnucash-help.xml | 12 ++-
help/CMakeLists.txt | 31 ++++--
help/de/gnucash-help.xml | 12 ++-
help/it/gnucash-help.xml | 8 ++
help/pt/gnucash-help.xml | 8 ++
31 files changed, 727 insertions(+), 248 deletions(-)
create mode 100644 cmake/AddChmTarget.cmake
rename cmake/{epub.cmake => AddEpubTarget.cmake} (60%)
create mode 100644 cmake/AddGHelpTarget.cmake
create mode 100644 cmake/AddGncDocTargets.cmake
create mode 100644 cmake/AddHtmlTarget.cmake
rename cmake/{pdf.cmake => AddPdfTarget.cmake} (78%)
rename cmake/{dist.cmake => DistCommon.cmake} (100%)
create mode 100644 cmake/MakeChm.cmake
create mode 100644 cmake/cmake_uninstall.cmake.in
delete mode 100644 cmake/gnc_doc_targets.cmake
delete mode 100644 cmake/xmldocs.cmake
More information about the gnucash-patches
mailing list