gnucash-on-flatpak master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sun Feb 16 13:46:04 EST 2020
Updated via https://github.com/Gnucash/gnucash-on-flatpak/commit/e7eb8cfc (commit)
via https://github.com/Gnucash/gnucash-on-flatpak/commit/3be733d1 (commit)
from https://github.com/Gnucash/gnucash-on-flatpak/commit/d21b04cd (commit)
commit e7eb8cfc997483cea19b64ed90752e0a2b4f147e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Feb 16 19:45:46 2020 +0100
Drop the comments about issues with flatpak-builder-tools
flatpak-builder-tools has accepted all my PRs so the comments are no longer relevant.
diff --git a/README.md b/README.md
index 88d9bc4..7ce31af 100644
--- a/README.md
+++ b/README.md
@@ -243,26 +243,13 @@ the previous step will be inluded as source list of the finance-quote module.
Keeping this separate allows us to easily update cpan dependencies in the future
without interfering with other parts of the manifest.
-Step 2 was not without issues and it took me a while to successfully create
-the snippet. In short: the current flatpak-builder-tools cpan generator is
-fairly fragile.
-- It will fail to include certain modules (those that don't write
-an insallation line to perllocal.pod during installation). This happens for example
-with the `HTML::Tree` module
-- the entry found in perllocal.pod can't be mapped back to the module's distribution
-name in some cases, like with the `Date::Parse` module. It's distribution name is
-TimeDate, and the current script errors out on this.
-
-Long story short, my github fork https://github.com/gjanssens/flatpak-builder-tools
-has patches that allowed me to proceed. I have offered them upstream for inclusion.
-
-From there I:
-
-- installed the required perl modules on my (Fedora) system using
+Expressed in simple commands:
+
+- install the required perl modules on my (Fedora) system using
`sudo dnf install 'perl(App::cpanminus)' 'perl(Getopt::Long::Descriptive)' 'perl(JSON::MaybeXS)' 'perl(LWP::UserAgent)' 'perl(MetaCPAN::Client)' 'perl(Pod::Simple::SimpleTree)'`
as mentioned on the flatpak-builder-tools page
-- ran `./flatpak-cpan-generator.pl Date::Manip Finance::Quote`
-- copied the resulting `generated-sources.json` to `modules/finance-quote-sources.json`
+- run `./flatpak-cpan-generator.pl Date::Manip Finance::Quote`
+- copy the resulting `generated-sources.json` to `modules/finance-quote-sources.json`
Note I have found the script to be not very version control friendly:
`generated-sources.json` will change a lot between runs. It will have the exact same
commit 3be733d1d3dcf147eb5cd7252c7ea28137eaace4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Feb 16 15:50:14 2020 +0100
switch to cmake build system for gnucash-docs
On a fast ssd the gnucash-docs step how becomes almost instantaneously.
diff --git a/templates/gnucash-targets-git.json.tpl b/templates/gnucash-targets-git.json.tpl
index c63815a..a3eca83 100644
--- a/templates/gnucash-targets-git.json.tpl
+++ b/templates/gnucash-targets-git.json.tpl
@@ -29,6 +29,7 @@
},
{
"name": "gnucash-docs",
+ "buildsystem": "cmake-ninja",
"sources": [
{
"type": "git",
diff --git a/templates/gnucash-targets-tar.json.tpl b/templates/gnucash-targets-tar.json.tpl
index 8d58bb8..6a4c693 100644
--- a/templates/gnucash-targets-tar.json.tpl
+++ b/templates/gnucash-targets-tar.json.tpl
@@ -28,6 +28,7 @@
},
{
"name": "gnucash-docs",
+ "buildsystem": "cmake-ninja",
"sources": [
{
"type": "archive",
Summary of changes:
README.md | 23 +++++------------------
templates/gnucash-targets-git.json.tpl | 1 +
templates/gnucash-targets-tar.json.tpl | 1 +
3 files changed, 7 insertions(+), 18 deletions(-)
More information about the gnucash-changes
mailing list