mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

OSX dmg: Put git-annex's version in the Info.plist file.

Browse source
This commit is contained in:
Joey Hess 2019-06-26 12:10:35 -04:00
parent bc7c17f0b2
commit 9273f80301
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -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 <id@joeyh.name> Sat, 15 Jun 2019 12:38:25 -0400

7
Makefile
View file

@ -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)"

4
doc/bugs/CFBundleShortVersionString_is_not_incremented_with_git-annex.dmg_releases___40__downloads.kitenet.net__41__.mdwn
View file

@ -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]]

4
standalone/osx/git-annex.app/Contents/Info.plist → standalone/osx/Info.plist.template
View file

@ -21,11 +21,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<string>GIT_ANNEX_VERSION</string>
<key>CFBundleSignature</key>
<string>git-annex</string>
<key>CFBundleVersion</key>
<string>0.0.1</string>
<string>GIT_ANNEX_VERSION</string>
<key>LSMinimumSystemVersion</key>
<string>10.5</string>
<key>CFBundleDisplayName</key>