diff --git a/CHANGELOG b/CHANGELOG index e3ad4a89dc..e284dc9a98 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ git-annex (7.20190616) UNRELEASED; urgency=medium * The Linux standalone arm build now works again on CPU versions below arm6. Thanks to Emanuele Olivetti, Ilias Tsitsimpis, Bernhard Übelacker, and Adrian Bunk for fixing ghc in Debian (bug #928882). + * OSX dmg: Put git-annex's version in the Info.plist file. -- Joey Hess Sat, 15 Jun 2019 12:38:25 -0400 diff --git a/Makefile b/Makefile index 5150922e5a..d202fba4a8 100644 --- a/Makefile +++ b/Makefile @@ -130,6 +130,8 @@ Build/InstallDesktopFile: Build/InstallDesktopFile.hs $(GHC) --make $@ -Wall -fno-warn-tabs Build/Standalone: Build/Standalone.hs tmp/configure-stamp $(GHC) --make $@ -Wall -fno-warn-tabs +Build/BuildVersion: Build/BuildVersion.hs + $(GHC) --make $@ -Wall -fno-warn-tabs Build/OSXMkLibs: Build/OSXMkLibs.hs $(GHC) --make $@ -Wall -fno-warn-tabs Build/LinuxMkLibs: Build/LinuxMkLibs.hs @@ -198,7 +200,7 @@ dpkg-buildpackage%: prep-standalone OSXAPP_DEST=tmp/build-dmg/git-annex.app OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle osxapp: - $(MAKE) git-annex Build/Standalone Build/OSXMkLibs + $(MAKE) git-annex Build/Standalone Build/OSXMkLibs Build/BuildVersion # Remove all RPATHs, both because this overloads the linker on # OSX Sierra, and to avoid the binary looking in someone's home @@ -210,6 +212,9 @@ osxapp: rm -rf "$(OSXAPP_DEST)" "$(OSXAPP_BASE)" install -d tmp/build-dmg cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)" + sed -e 's/GIT_ANNEX_VERSION/$(shell Build/BuildVersion)/' \ + < standalone/osx/Info.plist.template \ + > "$(OSXAPP_DEST)"/Contents/Info.plist install -d "$(OSXAPP_BASE)" cp git-annex "$(OSXAPP_BASE)" diff --git a/doc/bugs/CFBundleShortVersionString_is_not_incremented_with_git-annex.dmg_releases___40__downloads.kitenet.net__41__.mdwn b/doc/bugs/CFBundleShortVersionString_is_not_incremented_with_git-annex.dmg_releases___40__downloads.kitenet.net__41__.mdwn index 2d181234f4..e68647ec0e 100644 --- a/doc/bugs/CFBundleShortVersionString_is_not_incremented_with_git-annex.dmg_releases___40__downloads.kitenet.net__41__.mdwn +++ b/doc/bugs/CFBundleShortVersionString_is_not_incremented_with_git-annex.dmg_releases___40__downloads.kitenet.net__41__.mdwn @@ -55,3 +55,7 @@ E.g.: The release of [version 7.20190507](http://git-annex.branchable.com/news/ ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) Yes, loving git-annex, it's a great tool! + +> [[fixed|done]] in the build scripts, when the OSX app will successfully +> build again I am not sure. Thanks for reporting this, I had no idea there +> was a significant version in there. --[[Joey]] diff --git a/standalone/osx/git-annex.app/Contents/Info.plist b/standalone/osx/Info.plist.template similarity index 94% rename from standalone/osx/git-annex.app/Contents/Info.plist rename to standalone/osx/Info.plist.template index 91f8049873..389630fc2b 100644 --- a/standalone/osx/git-annex.app/Contents/Info.plist +++ b/standalone/osx/Info.plist.template @@ -21,11 +21,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.0.1 + GIT_ANNEX_VERSION CFBundleSignature git-annex CFBundleVersion - 0.0.1 + GIT_ANNEX_VERSION LSMinimumSystemVersion 10.5 CFBundleDisplayName