From f6aacbfe6d3d73dd83601a396c45d130add60313 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Fri, 4 Nov 2011 10:22:55 -0400 Subject: Mac releases use macdeployqtplus --- contrib/Bitcoin.app/Contents/Info.plist | 32 -------------- contrib/Bitcoin.app/Contents/MacOS/.higit | 0 .../Contents/Resources/BitcoinAppIcon.icns | Bin 286031 -> 0 bytes contrib/create_osx_dmg.sh | 47 --------------------- contrib/macdeploy/notes.txt | 2 +- doc/release-process.txt | 8 +++- 6 files changed, 8 insertions(+), 81 deletions(-) delete mode 100644 contrib/Bitcoin.app/Contents/Info.plist delete mode 100644 contrib/Bitcoin.app/Contents/MacOS/.higit delete mode 100644 contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns delete mode 100755 contrib/create_osx_dmg.sh diff --git a/contrib/Bitcoin.app/Contents/Info.plist b/contrib/Bitcoin.app/Contents/Info.plist deleted file mode 100644 index d5a278a570..0000000000 --- a/contrib/Bitcoin.app/Contents/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDisplayName - Bitcoin - CFBundleDevelopmentRegion - English - CFBundleExecutable - bitcoin - CFBundleIdentifier - org.bitcoin.bitcoin - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Bitcoin - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.4.1 - CFBundleSignature - ???? - CFBundleVersion - 400 - LSMinimumSystemVersion - 10.5 - CFBundleIconFile - BitcoinAppIcon.icns - LSMultipleInstancesProhibited - - - diff --git a/contrib/Bitcoin.app/Contents/MacOS/.higit b/contrib/Bitcoin.app/Contents/MacOS/.higit deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns b/contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns deleted file mode 100644 index 033ce1a607..0000000000 Binary files a/contrib/Bitcoin.app/Contents/Resources/BitcoinAppIcon.icns and /dev/null differ diff --git a/contrib/create_osx_dmg.sh b/contrib/create_osx_dmg.sh deleted file mode 100755 index d26dcc8242..0000000000 --- a/contrib/create_osx_dmg.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash -# -# Creates a Bitcoin.dmg OSX file from the contrib/BitcoinTemplate.dmg file -# -# Recipe from: http://digital-sushi.org/entry/how-to-create-a-disk-image-installer-for-apple-mac-os-x/ -# -# To make a prettier BitcoinTemplate.dmg: -# + open (mount) BitcoinTemplate.dmg -# + change the file properties, icon positions, background image, etc -# + eject, then commit the changed BitcoinTemplate.dmg -# - -CWD=$(pwd) - -if [ $# -lt 1 ]; then - if [ $(basename $CWD) == "contrib" ] - then - TOP=$(dirname $CWD) - else - echo "Usage: $0 /path/to/bitcoin/tree" - exit 1 - fi -else - TOP=$1 -fi - -# Create Bitcoin-Qt.app -cd "$TOP" -if [ ! -e Makefile ]; then qmake bitcoin-qt.pro; fi -make -macdeployqt Bitcoin-Qt.app -# Workaround a bug in macdeployqt: https://bugreports.qt.nokia.com/browse/QTBUG-21913 -# (when fixed, this won't be necessary) -cp /opt/local/lib/db48/libdb_cxx-4.8.dylib Bitcoin-Qt.app/Contents/Frameworks/ -install_name_tool -id @executable_path/../Frameworks/libdb_cxx-4.8.dylib \ - Bitcoin-Qt.app/Contents/Frameworks/libdb_cxx-4.8.dylib -install_name_tool -change libqt.3.dylib \ - @executable_path/../Frameworks/libqt.3.dylib \ - Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt - -# Create a .dmg -macdeployqt Bitcoin-Qt.app -dmg - -# Compile bitcoind -cd "$TOP/src" -STATIC=1 make -f makefile.osx - diff --git a/contrib/macdeploy/notes.txt b/contrib/macdeploy/notes.txt index ac794d0f7a..0654ff7169 100644 --- a/contrib/macdeploy/notes.txt +++ b/contrib/macdeploy/notes.txt @@ -6,7 +6,7 @@ You will need the appscript package for the fancy disk image creation to work. Install it by invoking "sudo easy_install appscript". Ths script should be invoked in the target directory like this: -$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,ru -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist +$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,es,ru -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist During the process, the disk image window will pop up briefly where the fancy settings are applied. This is normal, please do not interfere. diff --git a/doc/release-process.txt b/doc/release-process.txt index c487935ebb..f0e1ca28ca 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -74,7 +74,13 @@ * perform Mac build - TODO: document process + qmake USE_SSL=1 USE_UPNP=1 bitcoin-qt.pro + make + export QTDIR=/opt/local/share/qt4 + contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,ru -dmg -fancy contrib/macdeploy/fancy.plist + + Build output expected: + Bitcoin-Qt.dmg * upload source and builds to SourceForge -- cgit v1.2.3