diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/macosx/Info.plist.in (renamed from packaging/macosx/Info.plist) | 8 | ||||
| -rwxr-xr-x | packaging/macosx/make-package.sh | 14 |
2 files changed, 12 insertions, 10 deletions
diff --git a/packaging/macosx/Info.plist b/packaging/macosx/Info.plist.in index aecd9ab76..a623303a1 100644 --- a/packaging/macosx/Info.plist +++ b/packaging/macosx/Info.plist.in @@ -8,19 +8,15 @@ <string>Subsurface</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleGetInfoString</key> - <string>Multi Platform Divelog in C and Gtk</string> <key>CFBundleSignature</key> - <string>????</string> + <string>SBSF</string> <key>CFBundleExecutable</key> <string>subsurface</string> <key>CFBundleIdentifier</key> <string>org.hohndel.subsurface</string> <key>CFBundleInfoDictionaryVersion</key> <string>1.0</string> - <key>CFBundleVersionString</key> - <string>2.9</string> <key>CFBundleVersion</key> - <string>2.9</string> + <string>CFBUNDLEVERSION_TOKEN</string> </dict> </plist> 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 |