diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-07 08:37:21 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-05-07 08:37:21 -0700 |
| commit | 7aaaff37ffb3ad71b6a5423060965ce0c2012884 (patch) | |
| tree | 4cb8fb3787b4617a4d59478fa28bbd8add94261e | |
| parent | 911f0aa7ca2179444490935a90c233bf483b1389 (diff) | |
| parent | f95279ba79be1c46fe14468269ae53cdb3ac9c24 (diff) | |
Merge pull request #2532 from jonasschnelli/mac_plist_fix
fixes #2506: mac binary with proper version and copyright meta-informati...
| -rw-r--r-- | doc/release-process.txt | 1 | ||||
| -rw-r--r-- | share/qt/Info.plist | 6 | ||||
| -rwxr-xr-x | share/qt/clean_mac_info_plist.py | 29 |
3 files changed, 35 insertions, 1 deletions
diff --git a/doc/release-process.txt b/doc/release-process.txt index 29271ad224..ce6614335e 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -80,6 +80,7 @@ make export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale) + python2.7 share/qt/clean_mac_info_plist.py python2.7 contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist Build output expected: diff --git a/share/qt/Info.plist b/share/qt/Info.plist index 58b2152e9f..2312094c4f 100644 --- a/share/qt/Info.plist +++ b/share/qt/Info.plist @@ -7,7 +7,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleGetInfoString</key> - <string>Bitcoin-Qt</string> + <string>$VERSION, Copyright © 2009-$YEAR The Bitcoin developers</string> + <key>CFBundleShortVersionString</key> + <string>$VERSION</string> + <key>CFBundleVersion</key> + <string>$VERSION</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleExecutable</key> diff --git a/share/qt/clean_mac_info_plist.py b/share/qt/clean_mac_info_plist.py new file mode 100755 index 0000000000..df677f50b7 --- /dev/null +++ b/share/qt/clean_mac_info_plist.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python +# Jonas Schnelli, 2013 +# make sure the Bitcoin-Qt.app contains the right plist (including the right version) +# fix made because of serval bugs in Qt mac deployment (https://bugreports.qt-project.org/browse/QTBUG-21267) + +from string import Template +from datetime import date + +bitcoinDir = "./"; + +inFile = bitcoinDir+"/share/qt/Info.plist" +outFile = "Bitcoin-Qt.app/Contents/Info.plist" +version = "unknown"; + +fileForGrabbingVersion = bitcoinDir+"bitcoin-qt.pro" +for line in open(fileForGrabbingVersion): + lineArr = line.replace(" ", "").split("="); + if lineArr[0].startswith("VERSION"): + version = lineArr[1].replace("\n", ""); + +fIn = open(inFile, "r") +fileContent = fIn.read() +s = Template(fileContent) +newFileContent = s.substitute(VERSION=version,YEAR=date.today().year) + +fOut = open(outFile, "w"); +fOut.write(newFileContent); + +print "Info.plist fresh created"
\ No newline at end of file |