Merge pull request #528 from TheBlueMatt/gitian-downloader

Add win32 gitian download config.

diff --git a/contrib/BitcoinTemplate.dmg b/contrib/BitcoinTemplate.dmg
new file mode 100644 (file)
index 0000000..ca86308
Binary files /dev/null and b/contrib/BitcoinTemplate.dmg differ

diff --git a/contrib/create_osx_dmg.sh b/contrib/create_osx_dmg.sh
new file mode 100755 (executable)
index 0000000..af164e5
--- /dev/null
+++ b/contrib/create_osx_dmg.sh
@@ -0,0 +1,60 @@
+#!/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
+
+CONTRIB=$TOP/contrib
+BUILD_DIR=/tmp/bitcoin_osx_build
+
+# First, compile bitcoin and bitcoind
+cd "$TOP/src"
+if [ ! -e bitcoin ]; then make -f makefile.osx bitcoin; fi
+if [ ! -e bitcoind ]; then make -f makefile.osx bitcoind; fi
+strip bitcoin bitcoind
+
+mkdir -p "$BUILD_DIR"
+cd "$BUILD_DIR"
+
+rm -f Bitcoin.sparseimage
+hdiutil convert "$CONTRIB/BitcoinTemplate.dmg" -format UDSP -o Bitcoin
+hdiutil mount Bitcoin.sparseimage
+
+# Copy over placeholders in /Volumes/Bitcoin
+cp "$TOP/src/bitcoind" /Volumes/Bitcoin/
+cp "$TOP/src/bitcoin" /Volumes/Bitcoin/Bitcoin.app/Contents/MacOS/
+
+# Create source code .zip
+cd "$TOP"
+git archive -o /Volumes/Bitcoin/bitcoin.zip $(git branch 2>/dev/null|grep -e ^* | cut -d ' ' -f 2)
+
+# Fix permissions
+chmod -Rf go-w /Volumes/Bitcoin
+
+cd "$BUILD_DIR"
+hdiutil eject /Volumes/Bitcoin
+rm -f "$CWD/Bitcoin.dmg"
+hdiutil convert Bitcoin.sparseimage -format UDBZ -o "$CWD/Bitcoin.dmg"
+
+cd "$CWD"
+rm -rf "$BUILD_DIR"

diff --git a/doc/release-process.txt b/doc/release-process.txt
index bcda64d..2e8b93e 100644 (file)
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -33,6 +33,27 @@
   2. windows 32-bit binary + source
   3. windows installer
 
+* repackage gitian builds:
+
+  * Windows .zip and setup.exe:
+  $ mkdir bitcoin-$VERSION-win32
+  $ cd bitcoin-$VERSION-win32
+  $ unzip bitcoin-$VERSION-win32-gitian.zip
+  $ mv bitcoin-$VERSION-win32-setup.exe ..
+  $ cd ..; zip bitcoin-$VERSION-win32.zip bitcoin-$VERSION-win32
+
+  * Linux .tar.gz:
+  $ mkdir bitcoin-$VERSION-linux
+  $ cd bitcoin-$VERSION-linux
+  $ unzip bitcoin-$VERSION-linux-gitian.zip
+  $ cd ..; tar czvf bitcoin-$VERSION-linux.tar.gz bitcoin-$VERSION-linux
+
+* perform Mac build
+  * From the bitcoin source dir
+  $ cd contrib
+  $ ./create_osx_dmg.sh
+  $ mv Bitcoin.dmg bitcoin-$VERSION-macosx.dmg
+
 * upload source and builds to SF
 
 * create SHA1SUMS for builds, and PGP-sign it