gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/a3d40391 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/f6bb1d58 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/efcfc698 (commit)



commit a3d403913e1439da7dd0ad9bf5312aa9365e0871
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Feb 3 14:06:46 2018 -0800

    Release 2.7.4

diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index 3420e91..2bfb292 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Gnucash</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Gnucash version 2.7.3 © 2017 Gnucash Contributors</string>
+	<string>Gnucash version 2.7.4 © 2018 Gnucash Contributors</string>
 	<key>CFBundleIconFile</key>
 	<string>gnucash.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>2.7.3 © 2017 Gnucash Contributors</string>
+	<string>2.7.4 © 2018 Gnucash Contributors</string>
 	<key>CFBundleName</key>
 	<string>Gnucash</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.3</string>
+	<string>2.7.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.3</string>
+	<string>2.7.4</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>
@@ -64,7 +64,7 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.finance</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2017 Gnucash Contributors</string>
+	<string>Copyright 2018 Gnucash Contributors</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 </dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 5cfde1d..ac8f3fc 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -261,9 +261,9 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
 
 
 <cmake id="gnucash-unstable"
-        cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
-   <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.3.tar.bz2"
-           version="2.7.3" />
+        cmakeargs="-DGTEST_ROOT=${SRCROOT}/googletest/googletest -DGMOCK_ROOT=${SRCROOT}/googletest/googlemock">
+   <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.4.tar.bz2"
+           version="2.7.4" />
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
       <dep package="libofx"/>

commit f6bb1d58bbb109f1b211adba15dac75ef64026b9
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Feb 3 14:06:32 2018 -0800

    Include the AQBanking HBCI and EBCS command-line tools in the bundle.

diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 9b879be..2d099eb 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -26,13 +26,7 @@
     <run-install-name-tool/>
 
 
-    <!-- Optionally specify a launcher script to use. If the
-         application sets up everything needed itself, like
-         environment variable, linker paths, etc, a launcher script is
-         not needed. If the source path is left out, the default
-         script will be used.
-    -->
-    <!--launcher-script>${project}/gnucash-unstable.launcher</launcher-script-->
+    <!-- GnuCash doesn't need a launcher script. -->
 
     <!-- Not implemented: Optional runtime, could be python or mono
          for example.
@@ -83,6 +77,14 @@
     ${prefix}/bin/aqbanking-cli
   </binary>
 
+  <binary dest="${bundle}/Contents/MacOS">
+    ${prefix}/bin/aqebics-tool
+  </binary>
+
+  <binary dest="${bundle}/Contents/MacOS">
+    ${prefix}/bin/aqhbci-tool4
+  </binary>
+
   <binary loadable="True">
     ${prefix}/lib/dbd
   </binary>
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 6c16363..64a2e5c 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -92,6 +92,14 @@
   </binary>
 
   <binary dest="${bundle}/Contents/MacOS">
+    ${prefix}/bin/aqebics-tool
+  </binary>
+
+  <binary dest="${bundle}/Contents/MacOS">
+    ${prefix}/bin/aqhbci-tool4
+  </binary>
+
+  <binary dest="${bundle}/Contents/MacOS">
     ${prefix}/bin/chipcard-tool
   </binary>
 



Summary of changes:
 gnucash-bundler/Info-unstable.plist     | 10 +++++-----
 gnucash-bundler/gnucash-unstable.bundle | 16 +++++++++-------
 gnucash-bundler/gnucash.bundle          |  8 ++++++++
 modulesets/gnucash.modules              |  6 +++---
 4 files changed, 25 insertions(+), 15 deletions(-)