gnucash-on-flatpak master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sun Feb 16 07:40:49 EST 2020
Updated via https://github.com/Gnucash/gnucash-on-flatpak/commit/dfdc5589 (commit)
via https://github.com/Gnucash/gnucash-on-flatpak/commit/30c9b0fd (commit)
via https://github.com/Gnucash/gnucash-on-flatpak/commit/928f7927 (commit)
via https://github.com/Gnucash/gnucash-on-flatpak/commit/93053b96 (commit)
via https://github.com/Gnucash/gnucash-on-flatpak/commit/a1b97f6b (commit)
from https://github.com/Gnucash/gnucash-on-flatpak/commit/0061c192 (commit)
commit dfdc5589781877aa6c6ec4307188da8701d5cf81
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 15 16:50:05 2020 +0100
Complete the manifest file modularization
- instead of combining templates into the final manifest file use a common
manifest file for all common modules
- the modules that differ between tar or git builds will go into
a dynamically generated module file gnucash.json
- the common manifest file always includes this file
Further, for easy lookup of which manifest and modules files were used
to generate a given flatpak, also upload the used module files to
the public download site. For example this can be used to quickly check
what version of aqbanking was built into a given flatpak.
As there are now more files to uplaod, store them in a subdirectory
manifests/{maint,master,...}/<branch>/{manifestfile,modules}
diff --git a/.gitignore b/.gitignore
index b021a60..7863a52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ custom.sh
code_last_rev
docs_last_rev
gnucash-flatpak.gpg
-org.gnucash.GnuCash.json
+gnucash.json
diff --git a/build_package.sh b/build_package.sh
index 27fa55b..2f1d679 100755
--- a/build_package.sh
+++ b/build_package.sh
@@ -130,7 +130,8 @@ then
echo "Uploading flatpak manifest 'org.gnucash.GnuCash-$fp_branch.json'"
create_remote_dir "$host"/manifests
create_remote_dir "$host"/manifests/$remote_branch_dir
- rsync -a "$fp_git_dir"/org.gnucash.GnuCash.json "$host/manifests/$remote_branch_dir/org.gnucash.GnuCash-$fp_branch.json"
+ create_remote_dir "$host"/manifests/$remote_branch_dir/$fp_branch
+ rsync -a "$fp_git_dir"/org.gnucash.GnuCash.json "$fp_git_dir"/gnucash.json "$fp_git_dir"/modules "$host/manifests/$remote_branch_dir/$fp_branch"
echo "Synchronizing flatpak repository"
rsync -a $fp_repo "$host"
diff --git a/functions.sh b/functions.sh
index 9ca8768..5cabe22 100644
--- a/functions.sh
+++ b/functions.sh
@@ -187,17 +187,10 @@ function create_manifest()
# Note the variable names passed to envsubst:
# this limits the set of variables envsubst will effectively substitute
# We do this to prevent colisions with flatpak variables in the manifest
- gnucash_targets=$(envsubst '$code_repodir $docs_repodir $code_revision $docs_revision $revision $code_checksum $docs_checksum' \
- < "$fp_git_dir"/templates/gnucash-targets-${build_type}.json.tpl)
+ envsubst '$code_repodir $docs_repodir $code_revision $docs_revision $revision $code_checksum $docs_checksum' \
+ < "$fp_git_dir"/templates/gnucash-targets-${build_type}.json.tpl \
+ > "$fp_git_dir"/gnucash.json
fi
- export gnucash_targets
-
- # Note the variable names passed to envsubst:
- # this limits the set of variables envsubst will effectively substitute
- # We do this to prevent colisions with flatpak variables in the manifest
- envsubst '$gnucash_targets' \
- < "$fp_git_dir"/templates/org.gnucash.GnuCash.json.tpl \
- > "$fp_git_dir"/org.gnucash.GnuCash.json
}
function setup_sdk()
diff --git a/templates/org.gnucash.GnuCash.json.tpl b/org.gnucash.GnuCash.json
similarity index 97%
rename from templates/org.gnucash.GnuCash.json.tpl
rename to org.gnucash.GnuCash.json
index d28e4ce..b237958 100644
--- a/templates/org.gnucash.GnuCash.json.tpl
+++ b/org.gnucash.GnuCash.json
@@ -32,6 +32,6 @@
"modules/aqbanking.json",
"modules/boost.json",
"modules/googletest.json",
-${gnucash_targets}
+ "./gnucash.json"
]
}
diff --git a/templates/gnucash-targets-git.json.tpl b/templates/gnucash-targets-git.json.tpl
index ce1bb9b..c63815a 100644
--- a/templates/gnucash-targets-git.json.tpl
+++ b/templates/gnucash-targets-git.json.tpl
@@ -1,36 +1,41 @@
- "modules/swig.json",
- {
- "name": "gnucash",
- "buildsystem": "cmake-ninja",
- "config-opts": [
- "-DBOOST_ROOT=/app"
- ],
- "cleanup": [
- "/share/info",
- "/share/doc/gnucash/*.csv",
- "/share/doc/gnucash/*.qif",
- "/share/doc/gnucash/*.gnucash",
- "/share/doc/gnucash/ChangeLog*",
- "/share/doc/gnucash/HACKING",
- "/share/doc/gnucash/README*",
- "/share/doc/gnucash/guile-hackers.txt",
- "/share/doc/gnucash/projects.html"
- ],
- "sources": [
+{
+ "name": "gnucash-nightly-modules",
+ "modules": [
+ "modules/swig.json",
{
- "type": "git",
- "path": "${code_repodir}",
- "branch": "${code_revision}"
- }
- ]
- },
- {
- "name": "gnucash-docs",
- "sources": [
+ "name": "gnucash",
+ "buildsystem": "cmake-ninja",
+ "config-opts": [
+ "-DBOOST_ROOT=/app"
+ ],
+ "cleanup": [
+ "/share/info",
+ "/share/doc/gnucash/*.csv",
+ "/share/doc/gnucash/*.qif",
+ "/share/doc/gnucash/*.gnucash",
+ "/share/doc/gnucash/ChangeLog*",
+ "/share/doc/gnucash/HACKING",
+ "/share/doc/gnucash/README*",
+ "/share/doc/gnucash/guile-hackers.txt",
+ "/share/doc/gnucash/projects.html"
+ ],
+ "sources": [
+ {
+ "type": "git",
+ "path": "${code_repodir}",
+ "branch": "${code_revision}"
+ }
+ ]
+ },
{
- "type": "git",
- "path": "${docs_repodir}",
- "branch": "${docs_revision}"
+ "name": "gnucash-docs",
+ "sources": [
+ {
+ "type": "git",
+ "path": "${docs_repodir}",
+ "branch": "${docs_revision}"
+ }
+ ]
}
- ]
- }
+ ]
+}
diff --git a/templates/gnucash-targets-tar.json.tpl b/templates/gnucash-targets-tar.json.tpl
index 567b73f..8d58bb8 100644
--- a/templates/gnucash-targets-tar.json.tpl
+++ b/templates/gnucash-targets-tar.json.tpl
@@ -1,35 +1,41 @@
- {
- "name": "gnucash",
- "buildsystem": "cmake-ninja",
- "config-opts": [
- "-DBOOST_ROOT=/app"
- ],
- "cleanup": [
- "/share/info",
- "/share/doc/gnucash/*.csv",
- "/share/doc/gnucash/*.qif",
- "/share/doc/gnucash/*.gnucash",
- "/share/doc/gnucash/ChangeLog*",
- "/share/doc/gnucash/HACKING",
- "/share/doc/gnucash/README*",
- "/share/doc/gnucash/guile-hackers.txt",
- "/share/doc/gnucash/projects.html"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "http://downloads.sourceforge.net/gnucash/gnucash (stable)/${revision}/gnucash-${code_revision}.tar.bz2",
- "sha256": "${code_checksum}"
- }
- ]
- },
- {
- "name": "gnucash-docs",
- "sources": [
+{
+ "name": "gnucash-release-modules",
+ "modules": [
+ {
+ "name": "gnucash",
+ "buildsystem": "cmake-ninja",
+ "config-opts": [
+ "-DBOOST_ROOT=/app"
+ ],
+ "cleanup": [
+ "/share/info",
+ "/share/doc/gnucash/*.csv",
+ "/share/doc/gnucash/*.qif",
+ "/share/doc/gnucash/*.gnucash",
+ "/share/doc/gnucash/ChangeLog*",
+ "/share/doc/gnucash/HACKING",
+ "/share/doc/gnucash/README*",
+ "/share/doc/gnucash/guile-hackers.txt",
+ "/share/doc/gnucash/projects.html"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://downloads.sourceforge.net/gnucash/gnucash (stable)/${revision}/gnucash-${code_revision}.tar.bz2",
+ "sha256": "${code_checksum}"
+ }
+ ]
+ },
{
- "type": "archive",
- "url": "http://downloads.sourceforge.net/gnucash/gnucash (stable)/${revision}/gnucash-docs-${docs_revision}.tar.gz",
- "sha256": "${docs_checksum}"
+ "name": "gnucash-docs",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://downloads.sourceforge.net/gnucash/gnucash (stable)/${revision}/gnucash-docs-${docs_revision}.tar.gz",
+ "sha256": "${docs_checksum}"
+ }
+ ]
}
- ]
- }
+ ]
+}
+
commit 30c9b0fd59bd858c6dbebbf9156a70b104d1cc51
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 15 15:56:17 2020 +0100
Cleanup - group all patches in a patches subdirectory
diff --git a/modules/libofx.json b/modules/libofx.json
index 04a80fa..33c956c 100644
--- a/modules/libofx.json
+++ b/modules/libofx.json
@@ -48,7 +48,7 @@
},
{
"type": "patch",
- "path": "../gengetopt-makefile.patch"
+ "path": "../patches/gengetopt-makefile.patch"
},
{
"type": "script",
diff --git a/modules/mariadb.json b/modules/mariadb.json
index 94912b3..edb4ea7 100644
--- a/modules/mariadb.json
+++ b/modules/mariadb.json
@@ -59,10 +59,10 @@
{
"type": "patch",
"paths": [
- "../link-libs.patch",
- "../fix-install-dirs.patch",
- "../no-werror.patch",
- "../fix-build-flags.patch"
+ "../patches/link-libs.patch",
+ "../patches/fix-install-dirs.patch",
+ "../patches/no-werror.patch",
+ "../patches/fix-build-flags.patch"
]
}
]
diff --git a/fix-build-flags.patch b/patches/fix-build-flags.patch
similarity index 100%
rename from fix-build-flags.patch
rename to patches/fix-build-flags.patch
diff --git a/fix-install-dirs.patch b/patches/fix-install-dirs.patch
similarity index 100%
rename from fix-install-dirs.patch
rename to patches/fix-install-dirs.patch
diff --git a/gengetopt-makefile.patch b/patches/gengetopt-makefile.patch
similarity index 100%
rename from gengetopt-makefile.patch
rename to patches/gengetopt-makefile.patch
diff --git a/link-libs.patch b/patches/link-libs.patch
similarity index 100%
rename from link-libs.patch
rename to patches/link-libs.patch
diff --git a/no-werror.patch b/patches/no-werror.patch
similarity index 100%
rename from no-werror.patch
rename to patches/no-werror.patch
commit 928f7927f320bb7c212cfc1543fcbe8fde8bd50b
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 15 15:30:50 2020 +0100
Continue modularization of manifest file
diff --git a/modules/aqbanking.json b/modules/aqbanking.json
index 7adb47f..b346c26 100644
--- a/modules/aqbanking.json
+++ b/modules/aqbanking.json
@@ -10,6 +10,33 @@
}
],
"modules": [
+ {
+ "name": "xmlsec",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.26.tar.gz",
+ "sha256": "8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50"
+ }
+ ]
+ },
+ {
+ "name": "libpcsclite",
+ "config-opts": [
+ "--disable-libsystemd",
+ "--disable-serial",
+ "--disable-usb",
+ "--disable-libudev",
+ "--with-systemdsystemunitdir=no"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://pcsclite.apdu.fr/files/pcsc-lite-1.8.24.tar.bz2",
+ "sha256": "b81864fa6a5ec776639c02ae89998955f7702a8d10e8b8f70023c5a599d97568"
+ }
+ ]
+ },
{
"name": "gwenhywfar",
"config-opts": [
diff --git a/modules/boost.json b/modules/boost.json
new file mode 100644
index 0000000..81386c5
--- /dev/null
+++ b/modules/boost.json
@@ -0,0 +1,16 @@
+{
+ "name": "boost",
+ "buildsystem": "simple",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2",
+ "sha256": "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
+ }
+ ],
+ "build-commands": [
+ "./bootstrap.sh --prefix=/app --with-libraries=locale,filesystem,system,date_time,regex",
+ "./b2 headers",
+ "./b2 -j$FLATPAK_BUILDER_N_JOBS install variant=release --layout=system"
+ ]
+}
diff --git a/modules/googletest.json b/modules/googletest.json
new file mode 100644
index 0000000..7385d6e
--- /dev/null
+++ b/modules/googletest.json
@@ -0,0 +1,12 @@
+{
+ "name": "googletest",
+ "buildsystem": "cmake-ninja",
+ "cleanup": ["*"],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://github.com/google/googletest/archive/release-1.8.0.tar.gz",
+ "sha256": "58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8"
+ }
+ ]
+}
diff --git a/modules/libdbi.json b/modules/libdbi.json
new file mode 100644
index 0000000..4c2e802
--- /dev/null
+++ b/modules/libdbi.json
@@ -0,0 +1,51 @@
+{
+ "name": "libdbi-drivers",
+ "rm-configure": true,
+ "config-opts": [
+ "--disable-docs",
+ "--with-dbi-libdir=/app/lib/",
+ "--with-dbi-incdir=/app/include/",
+ "--with-mysql",
+ "--with-pgsql",
+ "--with-sqlite3"
+ ],
+ "cleanup": [
+ "/share",
+ "/var"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://downloads.sourceforge.net/project/libdbi-drivers/libdbi-drivers/libdbi-drivers-0.9.0/libdbi-drivers-0.9.0.tar.gz",
+ "sha256": "43d2eacd573a4faff296fa925dd97fbf2aedbf1ae35c6263478210c61004c854"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "rm -f config.guess"
+ ]
+ }
+ ],
+ "modules": [
+ {
+ "name": "libdbi",
+ "rm-configure": true,
+ "cleanup": [
+ "/share"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://downloads.sourceforge.net/project/libdbi/libdbi/libdbi-0.9.0/libdbi-0.9.0.tar.gz",
+ "sha256": "dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "rm -f config.guess"
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/modules/libofx.json b/modules/libofx.json
new file mode 100644
index 0000000..04a80fa
--- /dev/null
+++ b/modules/libofx.json
@@ -0,0 +1,63 @@
+{
+ "name": "libofx",
+ "no-parallel-make": true,
+ "config-opts": [
+ "--with-opensp-includes=/app/include/OpenSP",
+ "--with-opensp-libs=/lib"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://github.com/libofx/libofx/archive/0.9.14.tar.gz",
+ "sha256": "85a732efe3026e96fe1cf694ebdcf5d2c3b67adba85b9019abac44e7c43d8ce5"
+ }
+ ],
+ "modules": [
+ {
+ "name": "opensp",
+ "rm-configure": true,
+ "config-opts": [
+ "--disable-doc-build"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://downloads.sourceforge.net/project/openjade/opensp/1.5.2/OpenSP-1.5.2.tar.gz",
+ "sha256": "57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce"
+ },
+ {
+ "type": "script",
+ "dest-filename": "autogen.sh",
+ "commands": [
+ "autoreconf -vfi"
+ ]
+ }
+ ]
+ },
+ {
+ "name": "gengetopt",
+ "config-opts": [
+ "--prefix=/app"
+ ],
+ "rm-configure": true,
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://ftp.gnu.org/gnu/gengetopt/gengetopt-2.22.6.tar.gz",
+ "sha256": "30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7"
+ },
+ {
+ "type": "patch",
+ "path": "../gengetopt-makefile.patch"
+ },
+ {
+ "type": "script",
+ "dest-filename": "autogen.sh",
+ "commands": [
+ "autoreconf -vfi"
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/modules/mariadb.json b/modules/mariadb.json
new file mode 100644
index 0000000..94912b3
--- /dev/null
+++ b/modules/mariadb.json
@@ -0,0 +1,71 @@
+{
+ "name": "mariadb",
+ "buildsystem": "cmake",
+ "no-make-install": true,
+ "config-opts": [
+ "-DBUILD_CONFIG=mysql_release",
+ "-DWITH_INNOBASE_STORAGE_ENGINE=1",
+ "-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1",
+ "-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1",
+ "-DWITHOUT_PARTITION_STORAGE_ENGINE=1",
+ "-DWITHOUT_TOKUDB=1",
+ "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1",
+ "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1",
+ "-DWITHOUT_PBXT_STORAGE_ENGINE=1"
+ ],
+ "post-install": [
+ "make -C libmysql install",
+ "make -C include install",
+ "install -Dm755 scripts/mysql_config /app/bin/mysql_config",
+ "install -Dm644 support-files/mariadb.pc /app/share/pkgconfig/mariadb.pc"
+ ],
+ "cleanup": [
+ "/bin/"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-10.1.32/source/mariadb-10.1.32.tar.gz",
+ "sha256": "0e2aae6a6a190d07c8e36e87dd43377057fa82651ca3c583462563f3e9369096"
+ }
+ ],
+ "modules": [
+ {
+ "name": "jemalloc",
+ "cleanup": [
+ "/bin/",
+ "/share"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://github.com/jemalloc/jemalloc/releases/download/5.0.1/jemalloc-5.0.1.tar.bz2",
+ "sha256": "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"
+ }
+ ]
+ },
+ {
+ "name": "libaio",
+ "no-autogen": true,
+ "make-install-args": [
+ "prefix=/app"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://ftp.de.debian.org/debian/pool/main/liba/libaio/libaio_0.3.110.orig.tar.gz",
+ "sha256": "e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e"
+ },
+ {
+ "type": "patch",
+ "paths": [
+ "../link-libs.patch",
+ "../fix-install-dirs.patch",
+ "../no-werror.patch",
+ "../fix-build-flags.patch"
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/modules/postgresql.json b/modules/postgresql.json
new file mode 100644
index 0000000..3df47d2
--- /dev/null
+++ b/modules/postgresql.json
@@ -0,0 +1,20 @@
+{
+ "name": "postgresql",
+ "no-make-install": true,
+ "post-install": [
+ "make -C src/include install",
+ "make -C src/interfaces install",
+ "make -C src/bin/pg_config install"
+ ],
+ "cleanup": [
+ "/bin",
+ "/share"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://ftp.postgresql.org/pub/source/v9.6.8/postgresql-9.6.8.tar.bz2",
+ "sha256": "eafdb3b912e9ec34bdd28b651d00226a6253ba65036cb9a41cad2d9e82e3eb70"
+ }
+ ]
+}
diff --git a/templates/org.gnucash.GnuCash.json.tpl b/templates/org.gnucash.GnuCash.json.tpl
index a3247b7..d28e4ce 100644
--- a/templates/org.gnucash.GnuCash.json.tpl
+++ b/templates/org.gnucash.GnuCash.json.tpl
@@ -25,259 +25,13 @@
],
"modules": [
"modules/guile.json",
- {
- "name": "opensp",
- "rm-configure": true,
- "config-opts": [ "--disable-doc-build" ],
- "sources": [
- {
- "type": "archive",
- "url": "https://downloads.sourceforge.net/project/openjade/opensp/1.5.2/OpenSP-1.5.2.tar.gz",
- "sha256": "57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce"
- },
- {
- "type": "script",
- "dest-filename": "autogen.sh",
- "commands": [
- "autoreconf -vfi"
- ]
- }
- ]
- },
- {
- "name": "gengetopt",
- "config-opts": [
- "--prefix=/app"
- ],
- "rm-configure": true,
- "sources": [
- {
- "type": "archive",
- "url": "https://ftp.gnu.org/gnu/gengetopt/gengetopt-2.22.6.tar.gz",
- "sha256": "30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7"
- },
- {
- "type": "patch",
- "path": "gengetopt-makefile.patch"
- },
- {
- "type": "script",
- "dest-filename": "autogen.sh",
- "commands": [
- "autoreconf -vfi"
- ]
- }
- ]
- },
- {
- "name": "libofx",
- "no-parallel-make": true,
- "config-opts": [
- "--with-opensp-includes=/app/include/OpenSP",
- "--with-opensp-libs=/lib"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "https://github.com/libofx/libofx/archive/0.9.14.tar.gz",
- "sha256": "85a732efe3026e96fe1cf694ebdcf5d2c3b67adba85b9019abac44e7c43d8ce5"
- }
- ]
- },
- {
- "name": "jemalloc",
- "cleanup": [
- "/bin/",
- "/share"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "https://github.com/jemalloc/jemalloc/releases/download/5.0.1/jemalloc-5.0.1.tar.bz2",
- "sha256": "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"
- }
- ]
- },
- {
- "name": "libaio",
- "no-autogen": true,
- "make-install-args": [
- "prefix=/app"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "http://ftp.de.debian.org/debian/pool/main/liba/libaio/libaio_0.3.110.orig.tar.gz",
- "sha256": "e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e"
- },
- {
- "type": "patch",
- "paths": [
- "link-libs.patch",
- "fix-install-dirs.patch",
- "no-werror.patch",
- "fix-build-flags.patch"
- ]
- }
- ]
- },
- {
- "name": "mariadb",
- "buildsystem": "cmake",
- "no-make-install": true,
- "config-opts": [
- "-DBUILD_CONFIG=mysql_release",
- "-DWITH_INNOBASE_STORAGE_ENGINE=1",
- "-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1",
- "-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1",
- "-DWITHOUT_PARTITION_STORAGE_ENGINE=1",
- "-DWITHOUT_TOKUDB=1",
- "-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1",
- "-DWITHOUT_FEDERATED_STORAGE_ENGINE=1",
- "-DWITHOUT_PBXT_STORAGE_ENGINE=1"
- ],
- "post-install": [
- "make -C libmysql install",
- "make -C include install",
- "install -Dm755 scripts/mysql_config /app/bin/mysql_config",
- "install -Dm644 support-files/mariadb.pc /app/share/pkgconfig/mariadb.pc"
- ],
- "cleanup": [
- "/bin/"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-10.1.32/source/mariadb-10.1.32.tar.gz",
- "sha256": "0e2aae6a6a190d07c8e36e87dd43377057fa82651ca3c583462563f3e9369096"
- }
- ]
- },
- {
- "name": "postgresql",
- "no-make-install": true,
- "post-install": [
- "make -C src/include install",
- "make -C src/interfaces install",
- "make -C src/bin/pg_config install"
- ],
- "cleanup": [
- "/bin",
- "/share"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "https://ftp.postgresql.org/pub/source/v9.6.8/postgresql-9.6.8.tar.bz2",
- "sha256": "eafdb3b912e9ec34bdd28b651d00226a6253ba65036cb9a41cad2d9e82e3eb70"
- }
- ]
- },
- {
- "name": "libdbi",
- "rm-configure": true,
- "cleanup": [
- "/share"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "http://downloads.sourceforge.net/project/libdbi/libdbi/libdbi-0.9.0/libdbi-0.9.0.tar.gz",
- "sha256": "dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503"
- },
- {
- "type": "shell",
- "commands": [
- "rm -f config.guess"
- ]
- }
- ]
- },
- {
- "name": "libdbi-drivers",
- "rm-configure": true,
- "config-opts": [
- "--disable-docs",
- "--with-dbi-libdir=/app/lib/",
- "--with-dbi-incdir=/app/include/",
- "--with-mysql",
- "--with-pgsql",
- "--with-sqlite3"
- ],
- "cleanup": [
- "/share",
- "/var"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "http://downloads.sourceforge.net/project/libdbi-drivers/libdbi-drivers/libdbi-drivers-0.9.0/libdbi-drivers-0.9.0.tar.gz",
- "sha256": "43d2eacd573a4faff296fa925dd97fbf2aedbf1ae35c6263478210c61004c854"
- },
- {
- "type": "shell",
- "commands": [
- "rm -f config.guess"
- ]
- }
- ]
- },
- {
- "name": "xmlsec",
- "sources": [
- {
- "type": "archive",
- "url": "https://www.aleksey.com/xmlsec/download/xmlsec1-1.2.26.tar.gz",
- "sha256": "8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50"
- }
- ]
- },
- {
- "name": "libpcsclite",
- "config-opts": [
- "--disable-libsystemd",
- "--disable-serial",
- "--disable-usb",
- "--disable-libudev",
- "--with-systemdsystemunitdir=no"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "https://pcsclite.apdu.fr/files/pcsc-lite-1.8.24.tar.bz2",
- "sha256": "b81864fa6a5ec776639c02ae89998955f7702a8d10e8b8f70023c5a599d97568"
- }
- ]
- },
+ "modules/libofx.json",
+ "modules/mariadb.json",
+ "modules/postgresql.json",
+ "modules/libdbi.json",
"modules/aqbanking.json",
- {
- "name": "boost",
- "buildsystem": "simple",
- "sources": [
- {
- "type": "archive",
- "url": "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2",
- "sha256": "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
- }
- ],
- "build-commands": [
- "./bootstrap.sh --prefix=/app --with-libraries=locale,filesystem,system,date_time,regex",
- "./b2 headers",
- "./b2 -j$FLATPAK_BUILDER_N_JOBS install variant=release --layout=system"
- ]
- },
- {
- "name": "googletest",
- "buildsystem": "cmake-ninja",
- "cleanup": ["*"],
- "sources": [
- {
- "type": "archive",
- "url": "https://github.com/google/googletest/archive/release-1.8.0.tar.gz",
- "sha256": "58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8"
- }
- ]
- },
+ "modules/boost.json",
+ "modules/googletest.json",
${gnucash_targets}
]
}
commit 93053b963a2cf8f2665146cdfa9b083a0ecd0c3b
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 15 14:21:24 2020 +0100
extras-git really means swig
So rename the module
diff --git a/modules/extra-deps-git.json b/modules/extra-deps-git.json
deleted file mode 100644
index 67d213a..0000000
--- a/modules/extra-deps-git.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "name": "extra-deps-git",
- "modules":
- [
- {
- "name": "pcre",
- "config-opts": [
- "--enable-unicode-properties"
- ],
- "cleanup": ["*"],
- "sources": [
- {
- "type": "archive",
- "url": "http://prdownloads.sourceforge.net/pcre/pcre-8.42.tar.bz2",
- "sha256": "2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
- }
- ]
- },
- {
- "name": "swig",
- "config-opts": [
- "-with-boost-libs=/app/lib",
- "--without-alllang",
- "--with-guile=/app/bin/guile",
- "--with-guile-config=/app/bin/guile-config"
- ],
- "cleanup": ["*"],
- "sources": [
- {
- "type": "archive",
- "url": "http://prdownloads.sourceforge.net/swig/swig-3.0.12.tar.gz",
- "sha256": "7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d"
- }
- ]
- }
- ]
-}
diff --git a/modules/swig.json b/modules/swig.json
new file mode 100644
index 0000000..083680e
--- /dev/null
+++ b/modules/swig.json
@@ -0,0 +1,33 @@
+{
+ "name": "swig",
+ "config-opts": [
+ "-with-boost-libs=/app/lib",
+ "--without-alllang",
+ "--with-guile=/app/bin/guile",
+ "--with-guile-config=/app/bin/guile-config"
+ ],
+ "cleanup": ["*"],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://prdownloads.sourceforge.net/swig/swig-3.0.12.tar.gz",
+ "sha256": "7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d"
+ }
+ ],
+ "modules": [
+ {
+ "name": "pcre",
+ "config-opts": [
+ "--enable-unicode-properties"
+ ],
+ "cleanup": ["*"],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://prdownloads.sourceforge.net/pcre/pcre-8.42.tar.bz2",
+ "sha256": "2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
+ }
+ ]
+ }
+ ]
+}
diff --git a/templates/gnucash-targets-git.json.tpl b/templates/gnucash-targets-git.json.tpl
index aca5c3c..ce1bb9b 100644
--- a/templates/gnucash-targets-git.json.tpl
+++ b/templates/gnucash-targets-git.json.tpl
@@ -1,4 +1,4 @@
- "modules/extra-deps-git.json",
+ "modules/swig.json",
{
"name": "gnucash",
"buildsystem": "cmake-ninja",
commit a1b97f6be9414ae2a2290ff81b1c455a716d079e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Feb 15 14:10:55 2020 +0100
Begin modularizing manifest file
Group dependencies in separate module files for easier maintenance.
In this initial commit the following bits have been moved to a separate
module file
- aqbanking and dependencies (gwenhywfar and libchipcard)
- guile and dependencies (gc and libunistring)
- build dependencies only needed for git builds
More will follow in future commits
diff --git a/functions.sh b/functions.sh
index 16fa8d3..9ca8768 100644
--- a/functions.sh
+++ b/functions.sh
@@ -182,12 +182,6 @@ function create_manifest()
# Export environment variables used in the templates in order for envsubst to find them
export code_repodir docs_repodir code_checksum docs_checksum revision code_revision docs_revision
- # In the functions below build_type selects the proper templates to initiate
- # a git or a tar build. build_type is determined earlier in build_package.sh
- extra_deps=
- if [[ -f "$fp_git_dir"/templates/extra-deps-${build_type}.json.tpl ]]; then
- extra_deps=$(cat "$fp_git_dir"/templates/extra-deps-${build_type}.json.tpl)
- fi
gnucash_targets=
if [[ -f "$fp_git_dir"/templates/gnucash-targets-${build_type}.json.tpl ]]; then
# Note the variable names passed to envsubst:
@@ -196,12 +190,12 @@ function create_manifest()
gnucash_targets=$(envsubst '$code_repodir $docs_repodir $code_revision $docs_revision $revision $code_checksum $docs_checksum' \
< "$fp_git_dir"/templates/gnucash-targets-${build_type}.json.tpl)
fi
- export extra_deps gnucash_targets
+ export gnucash_targets
# Note the variable names passed to envsubst:
# this limits the set of variables envsubst will effectively substitute
# We do this to prevent colisions with flatpak variables in the manifest
- envsubst '$extra_deps $gnucash_targets' \
+ envsubst '$gnucash_targets' \
< "$fp_git_dir"/templates/org.gnucash.GnuCash.json.tpl \
> "$fp_git_dir"/org.gnucash.GnuCash.json
}
diff --git a/modules/aqbanking.json b/modules/aqbanking.json
new file mode 100644
index 0000000..7adb47f
--- /dev/null
+++ b/modules/aqbanking.json
@@ -0,0 +1,37 @@
+
+{
+ "name": "aqbanking",
+ "no-parallel-make": true,
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://www.aquamaniac.de/rdm/attachments/download/243/aqbanking-6.0.2.tar.gz",
+ "sha256": "1d16f0a16ceb25ec7e8f8cfba6c21f64e18f5e4124f2144957958738fdb08158"
+ }
+ ],
+ "modules": [
+ {
+ "name": "gwenhywfar",
+ "config-opts": [
+ "--with-guis='gtk3'"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://www.aquamaniac.de/rdm/attachments/download/242/gwenhywfar-5.1.3.tar.gz",
+ "sha256": "19b4f80994db8e00812879f908b33195d61b807dbe7cd8dc3dd0104f524b5976"
+ }
+ ]
+ },
+ {
+ "name": "libchipcard",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://www.aquamaniac.de/rdm/attachments/download/229/libchipcard-5.1.5rc2.tar.gz",
+ "sha256": "32d2f8fe39f7ecb236c0cce2605333ebff47338435e0bfdaf1d8141f9bc79b7a"
+ }
+ ]
+ }
+ ]
+}
diff --git a/modules/extra-deps-git.json b/modules/extra-deps-git.json
new file mode 100644
index 0000000..67d213a
--- /dev/null
+++ b/modules/extra-deps-git.json
@@ -0,0 +1,37 @@
+{
+ "name": "extra-deps-git",
+ "modules":
+ [
+ {
+ "name": "pcre",
+ "config-opts": [
+ "--enable-unicode-properties"
+ ],
+ "cleanup": ["*"],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://prdownloads.sourceforge.net/pcre/pcre-8.42.tar.bz2",
+ "sha256": "2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
+ }
+ ]
+ },
+ {
+ "name": "swig",
+ "config-opts": [
+ "-with-boost-libs=/app/lib",
+ "--without-alllang",
+ "--with-guile=/app/bin/guile",
+ "--with-guile-config=/app/bin/guile-config"
+ ],
+ "cleanup": ["*"],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://prdownloads.sourceforge.net/swig/swig-3.0.12.tar.gz",
+ "sha256": "7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d"
+ }
+ ]
+ }
+ ]
+}
diff --git a/modules/guile.json b/modules/guile.json
new file mode 100644
index 0000000..c3f2cc1
--- /dev/null
+++ b/modules/guile.json
@@ -0,0 +1,38 @@
+{
+ "name": "guile",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://ftp.gnu.org/gnu/guile/guile-2.2.3.tar.xz",
+ "sha256": "8353a8849cd7aa77be66af04bd6bf7a6207440d2f8722e46672232bb9f0a4086"
+ }
+ ],
+ "modules": [
+ {
+ "name": "gc",
+ "cleanup": [
+ "/share"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://www.hboehm.info/gc/gc_source/gc-8.0.4.tar.gz",
+ "sha256": "436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d"
+ }
+ ]
+ },
+ {
+ "name": "libunistring",
+ "cleanup": [
+ "/share"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz",
+ "sha256": "eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7"
+ }
+ ]
+ }
+ ]
+}
diff --git a/templates/extra-deps-git.json.tpl b/templates/extra-deps-git.json.tpl
deleted file mode 100644
index 89540ff..0000000
--- a/templates/extra-deps-git.json.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
- {
- "name": "pcre",
- "config-opts": [
- "--enable-unicode-properties"
- ],
- "cleanup": ["*"],
- "sources": [
- {
- "type": "archive",
- "url": "http://prdownloads.sourceforge.net/pcre/pcre-8.42.tar.bz2",
- "sha256": "2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301"
- }
- ]
- },
- {
- "name": "swig",
- "config-opts": [
- "-with-boost-libs=/app/lib",
- "--without-alllang",
- "--with-guile=/app/bin/guile",
- "--with-guile-config=/app/bin/guile-config"
- ],
- "cleanup": ["*"],
- "sources": [
- {
- "type": "archive",
- "url": "http://prdownloads.sourceforge.net/swig/swig-3.0.12.tar.gz",
- "sha256": "7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d"
- }
- ]
- },
diff --git a/templates/gnucash-targets-git.json.tpl b/templates/gnucash-targets-git.json.tpl
index 17a2a33..aca5c3c 100644
--- a/templates/gnucash-targets-git.json.tpl
+++ b/templates/gnucash-targets-git.json.tpl
@@ -1,3 +1,4 @@
+ "modules/extra-deps-git.json",
{
"name": "gnucash",
"buildsystem": "cmake-ninja",
diff --git a/templates/org.gnucash.GnuCash.json.tpl b/templates/org.gnucash.GnuCash.json.tpl
index dbfd339..a3247b7 100644
--- a/templates/org.gnucash.GnuCash.json.tpl
+++ b/templates/org.gnucash.GnuCash.json.tpl
@@ -24,42 +24,7 @@
"/lib/pkgconfig"
],
"modules": [
- {
- "name": "gc",
- "cleanup": [
- "/share"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "http://www.hboehm.info/gc/gc_source/gc-8.0.4.tar.gz",
- "sha256": "436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d"
- }
- ]
- },
- {
- "name": "libunistring",
- "cleanup": [
- "/share"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "https://ftp.gnu.org/gnu/libunistring/libunistring-0.9.10.tar.xz",
- "sha256": "eb8fb2c3e4b6e2d336608377050892b54c3c983b646c561836550863003c05d7"
- }
- ]
- },
- {
- "name": "guile",
- "sources": [
- {
- "type": "archive",
- "url": "https://ftp.gnu.org/gnu/guile/guile-2.2.3.tar.xz",
- "sha256": "8353a8849cd7aa77be66af04bd6bf7a6207440d2f8722e46672232bb9f0a4086"
- }
- ]
- },
+ "modules/guile.json",
{
"name": "opensp",
"rm-configure": true,
@@ -284,40 +249,7 @@
}
]
},
- {
- "name": "gwenhywfar",
- "config-opts": [
- "--with-guis='gtk3'"
- ],
- "sources": [
- {
- "type": "archive",
- "url": "https://www.aquamaniac.de/rdm/attachments/download/242/gwenhywfar-5.1.3.tar.gz",
- "sha256": "19b4f80994db8e00812879f908b33195d61b807dbe7cd8dc3dd0104f524b5976"
- }
- ]
- },
- {
- "name": "libchipcard",
- "sources": [
- {
- "type": "archive",
- "url": "https://www.aquamaniac.de/rdm/attachments/download/229/libchipcard-5.1.5rc2.tar.gz",
- "sha256": "32d2f8fe39f7ecb236c0cce2605333ebff47338435e0bfdaf1d8141f9bc79b7a"
- }
- ]
- },
- {
- "name": "aqbanking",
- "no-parallel-make": true,
- "sources": [
- {
- "type": "archive",
- "url": "https://www.aquamaniac.de/rdm/attachments/download/243/aqbanking-6.0.2.tar.gz",
- "sha256": "1d16f0a16ceb25ec7e8f8cfba6c21f64e18f5e4124f2144957958738fdb08158"
- }
- ]
- },
+ "modules/aqbanking.json",
{
"name": "boost",
"buildsystem": "simple",
@@ -346,7 +278,6 @@
}
]
},
-${extra_deps}
${gnucash_targets}
]
}
Summary of changes:
.gitignore | 2 +-
build_package.sh | 3 +-
functions.sh | 19 +-
modules/aqbanking.json | 64 ++++
modules/boost.json | 16 +
modules/googletest.json | 12 +
modules/guile.json | 38 +++
modules/libdbi.json | 51 +++
modules/libofx.json | 63 ++++
modules/mariadb.json | 71 +++++
modules/postgresql.json | 20 ++
modules/swig.json | 33 ++
org.gnucash.GnuCash.json | 37 +++
.../fix-build-flags.patch | 0
.../fix-install-dirs.patch | 0
.../gengetopt-makefile.patch | 0
link-libs.patch => patches/link-libs.patch | 0
no-werror.patch => patches/no-werror.patch | 0
templates/extra-deps-git.json.tpl | 31 --
templates/gnucash-targets-git.json.tpl | 70 ++--
templates/gnucash-targets-tar.json.tpl | 72 +++--
templates/org.gnucash.GnuCash.json.tpl | 352 ---------------------
22 files changed, 488 insertions(+), 466 deletions(-)
create mode 100644 modules/aqbanking.json
create mode 100644 modules/boost.json
create mode 100644 modules/googletest.json
create mode 100644 modules/guile.json
create mode 100644 modules/libdbi.json
create mode 100644 modules/libofx.json
create mode 100644 modules/mariadb.json
create mode 100644 modules/postgresql.json
create mode 100644 modules/swig.json
create mode 100644 org.gnucash.GnuCash.json
rename fix-build-flags.patch => patches/fix-build-flags.patch (100%)
rename fix-install-dirs.patch => patches/fix-install-dirs.patch (100%)
rename gengetopt-makefile.patch => patches/gengetopt-makefile.patch (100%)
rename link-libs.patch => patches/link-libs.patch (100%)
rename no-werror.patch => patches/no-werror.patch (100%)
delete mode 100644 templates/extra-deps-git.json.tpl
delete mode 100644 templates/org.gnucash.GnuCash.json.tpl
More information about the gnucash-changes
mailing list