gnucash-on-windows master: Create new unstable branch.
John Ralls
jralls at code.gnucash.org
Sun Apr 26 12:27:47 EDT 2020
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/6c8510df (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/95d8a580 (commit)
commit 6c8510dff7018ec7698e9ee36b2fc00c49520232
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 26 09:26:40 2020 -0700
Create new unstable branch.
diff --git a/gnucash.modules b/gnucash.modules
index e44b044..439d87c 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -293,6 +293,23 @@
</dependencies>
</cmake>
+ <cmake id="gnucash-unstable"
+ cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON">
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.901/gnucash-3.901.tar.bz2"
+ repo="sourceforge" version="3.901"/>
+ <dependencies>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <dep package="libdbi-drivers"/>
+ <!--dep package="shared-mime-info"/-->
+ <!--dep package="iso-codes"/-->
+ <dep package="guile2"/>
+ <!--dep package="swig"/-->
+ <dep package="boost"/>
+ <dep package="googletest"/>
+ </dependencies>
+ </cmake>
+
<cmake id="gnucash-git"
cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DALLOW_OLD_GETTEXT=ON -DCMAKE_BUILD_TYPE=Debug">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
@@ -327,6 +344,13 @@
version="3.10" repo="sourceforge"/>
</autotools>
+ <autotools id="gnucash-unstable-docs"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
+ makeargs="chm" makeinstallargs="install-chm" >
+ <branch module="project/gnucash/gnucash%20%28unstable%29/3.901/gnucash-docs-3.901.tar.gz"
+ version="3.901" repo="sourceforge"/>
+ </autotools>
+
<metamodule id="meta-gnucash-git">
<dependencies>
<dep package="gnucash-git"/>
@@ -337,7 +361,14 @@
<metamodule id="meta-gnucash">
<dependencies>
<dep package="gnucash"/>
- <dep package="gnucash-docs-git"/>
+ <dep package="gnucash-docs"/>
+ </dependencies>
+ </metamodule>
+
+ <metamodule id="meta-gnucash-unstable">
+ <dependencies>
+ <dep package="gnucash-unstable"/>
+ <dep package="gnucash-unstable-docs"/>
</dependencies>
</metamodule>
diff --git a/jhbuildrc.in b/jhbuildrc.in
index c1a4d1f..4a514e3 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -71,6 +71,8 @@ else:
if _branch == 'releases':
modules = ["meta-gnucash"]
+elif _branch == 'unstable':
+ modules = ['meta-gnucash-unstable']
else:
modules = ["meta-gnucash-git"]
branches['gnucash-git'] = (None, _branch)
@@ -81,7 +83,8 @@ append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --
module_makeargs["aqbanking"]="-j 1"
module_extra_env["gnucash"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
+module_extra_env["gnucash-unstable"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
module_extra_env["gnucash-git"]={'GUILE_LOAD_PATH':os.path.join(prefix, 'share', 'guile', '2.2'), 'GUILE_LOAD_COMPILED_PATH':os.path.join(prefix, 'lib', 'guile', '2.2', 'ccache')}
-if _branch == 'master':
+if _branch in ('master', 'unstable'):
module_cmakeargs["gnucash-git"]=('-DGTEST_ROOT=$SRCROOT/googletest')
Summary of changes:
gnucash.modules | 33 ++++++++++++++++++++++++++++++++-
jhbuildrc.in | 5 ++++-
2 files changed, 36 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list