Further automization of the Mac build process

This improves the Plist.info and automates the version data that it uses
utilizing the same git magic that the Makefile uses.

It also makes the complete DMG creation a matter of simply running
packaging/macosx/make-package.sh

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 10 insertions, 4 deletions

diff --git a/packaging/macosx/make-package.sh b/packaging/macosx/make-package.sh
index 81e0f80f8..c8d21b283 100755
--- a/packaging/macosx/make-package.sh
+++ b/packaging/macosx/make-package.sh
@@ -21,16 +21,22 @@ DMGCREATE="../yoursway-create-dmg/create-dmg"
 # other components have been installed
 PREFIX="/Applications/Subsurface.app/Contents/Resources"
 
-# maybe we want to update this to use the git tag magic instead. That
-# would be more consistent
-VERSION=`grep -1 CFBundleVersionString packaging/macosx/Info.plist | tail -1 | cut -d\> -f 2 | cut -d\< -f 1`
+INFOPLIST=./packaging/macosx/Info.plist
+
+# same git version magic as in the Makefile
+VERSION=`git describe --tags --abbrev=12 | sed 's/v\([0-9]*\)\.\([0-9]*\)-\([0-9]*\)-.*/\1.\2.\3/ ; s/v\([0-9]\)\.\([0-9]*\)/\1.\2.0/' || echo "git.missing.please.hardcode.version"`
 
 # gtk-mac-bundler allegedly supports signing by setting this environment
 # variable, but this fails as we change the shared objects below and all
 # the signatures become invalid.
 # export APPLICATION_CERT="Dirk"
 
-# first clean up the staging area
+# force rebuilding of Info.plist
+rm ${INFOPLIST}
+
+# first build and install Subsurface and then clean up the staging area
+make
+make install-macosx
 rm -rf ./staging
 
 # now populate it with the bundle