gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Apr 15 18:49:54 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/3285c4a3 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/63b2e1aa (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/7fc6d296 (commit)



commit 3285c4a398cb2ddb337c9c993d72c3a41dc29715
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 15 15:47:18 2018 -0700

    Disable compiling schemas.
    
    It breaks because CMake can't see jhbuild's destdir and inserts a semicolon
    at the beginning of the path.

diff --git a/gnucash.modules b/gnucash.modules
index dd03315..bd5e23f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -282,7 +282,7 @@
   </cmake>
 
  <cmake id="gnucash"
-        cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
+        cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_SCHEMAS=OFF"
 	use-ninja="False">
    <branch repo="sourceforge" module="gnucash/stable/gnucash-3.0.tar.bz2"
 	   version="3.0"/>
@@ -300,7 +300,7 @@
  </cmake>
 
  <cmake id="gnucash-git"
-        cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
+        cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock -DCOMPILE_SCHEMAS=OFF"
 	use-ninja="False">
    <branch repo="github" module="Gnucash/gnucash.git" revision="master"
 	   checkoutdir="gnucash-git"/>

commit 63b2e1aaa65fb91f1182afaaa07485632cc93bef
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 15 15:31:39 2018 -0700

    Further changes to support maint git builds.

diff --git a/buildserver/build_package.ps1 b/buildserver/build_package.ps1
index 491eb1f..a24d516 100644
--- a/buildserver/build_package.ps1
+++ b/buildserver/build_package.ps1
@@ -130,7 +130,7 @@ bash-command -command "jhbuild --no-interact -f $script_unix/jhbuildrc build > >
 $new_file = test-path -path $target_dir\$package\$branch\inst\bin\gnucash.exe -NewerThan $time_stamp
 if ($new_file) {
 #Build the installer
-    $is_git = ($branch.CompareTo("master") -eq 0) -or ($branch.CompareTo("unstable") -eq 0)
+    $is_git = ($branch.CompareTo("releases") -ne 0)
     bash-command -command "echo 'Creating GnuCash installer.' > >(tee -a $log_unix)"
     $setup_file = & $script_dir\bundle-mingw64.ps1 -root_dir $target_dir -target_dir $target_dir\$package\$branch -package $package -git_build $is_git 2>&1 | Tee-Object -FilePath $log_file -Append
     $setup_file = make-unixpath -path $setup_file
diff --git a/jhbuildrc.in b/jhbuildrc.in
index 69caf67..44f1425 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -70,11 +70,11 @@ else:
 
 #autogenargs = 'CPPFLAGS="-I%s"' % _sys_includes
 
-if _branch in ('master', 'unstable'):
+if _branch == 'releases':
+    modules = ["meta-gnucash"]
+else:
     modules = ["meta-gnucash-git"]
     branches['gnucash-git'] = (None, _branch)
-else:
-    modules = ["meta-gnucash"]
 
 _gtk_cflags = _popen("pkg-config --cflags gtk+-3.0")
 _gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")



Summary of changes:
 buildserver/build_package.ps1 | 2 +-
 gnucash.modules               | 4 ++--
 jhbuildrc.in                  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)



More information about the gnucash-changes mailing list