gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/2a6f00eb (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/8ba08c0e (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/b9f3a81e (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/3285c4a3 (commit)



commit 2a6f00eb573615fe30475823a17918d9489004e4
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 15 17:48:22 2018 -0700

    Fix the bundle file to match the script name.

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index e4f8d0c..8be5ab3 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -21,7 +21,7 @@ Compression=lzma
 MinVersion=5.0
 PrivilegesRequired=poweruser
 OutputDir=.
-OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at -setup
+OutputBaseFilename=@PACKAGE at -@PACKAGE_VERSION at .setup
 UninstallFilesDir={app}\uninstall\@PACKAGE@
 InfoAfterFile=@INST_DIR@\share\doc\@PACKAGE@\README.win32-bin.txt
 SetupIconFile=@INST_DIR@\share\@PACKAGE@\pixmaps\gnucash-icon.ico

commit 8ba08c0e72393682c3dcda861c9d87bb6c4c87f0
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 15 17:47:51 2018 -0700

    COMPILE_GSCHEMAS, not COMPILE_SCHEMAS.

diff --git a/gnucash.modules b/gnucash.modules
index bd5e23f..cb88f69 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 -DCOMPILE_SCHEMAS=OFF"
+        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_GSCHEMAS=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 -DCOMPILE_SCHEMAS=OFF"
+        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_GSCHEMAS=OFF"
 	use-ninja="False">
    <branch repo="github" module="Gnucash/gnucash.git" revision="master"
 	   checkoutdir="gnucash-git"/>

commit b9f3a81e752a7732c62ae989453ba50db4f44604
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Apr 15 17:44:15 2018 -0700

    Build GnuCash -j1, don't try to clean.
    
    CMake makes a bad make clean target that emits an error about
    "target pattern contains no '%'". Parallel build works OK in a
    clean directory but if the libraries are already in place make
    gets ahead of itself and the libraries can't be built because the
    old ones are busy.

diff --git a/jhbuildrc.in b/jhbuildrc.in
index 44f1425..79ab3a2 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -54,7 +54,6 @@ environ_append('CPPFLAGS', '-I%s -I%s' % (_mingw_includes, _usr_include))
 environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
 add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
 add_to_path_var('PATH', os.path.join(_mingw_base, 'bin'))
-makeclean = True
 
 os.environ['SRCROOT'] = checkoutroot
 os.environ['PREFIX'] = prefix
@@ -81,6 +80,8 @@ _gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
 append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
 append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
 module_makeargs["aqbanking"]="-j 1"
+module_makeargs["gnucash"]="-j 1"
+module_makeargs["gnucash-git"]="-j 1"
 
 module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
 module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}



Summary of changes:
 gnucash.modules                | 4 ++--
 inno_setup/gnucash-mingw64.iss | 2 +-
 jhbuildrc.in                   | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)