diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-11 21:07:09 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-11 21:07:09 +0200 |
| commit | fbea7eca656bf5797a2c5cf748715a1ae332835b (patch) | |
| tree | 086eaa276ff3b7dc72fc72cb20317f92556c67ce /contrib | |
| parent | d85f2458007ba8f7558220a99fe1dd03abd74307 (diff) | |
| parent | 755e2819b059d3e9d8148c4802c6f12e7af3fad5 (diff) | |
| download | bitcoin-fbea7eca656bf5797a2c5cf748715a1ae332835b.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/create_osx_dmg.sh | 51 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian.yml | 4 |
2 files changed, 21 insertions, 34 deletions
diff --git a/contrib/create_osx_dmg.sh b/contrib/create_osx_dmg.sh index af164e56cf..d26dcc8242 100755 --- a/contrib/create_osx_dmg.sh +++ b/contrib/create_osx_dmg.sh @@ -24,37 +24,24 @@ 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 +# Create Bitcoin-Qt.app 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" +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 -cd "$CWD" -rm -rf "$BUILD_DIR" diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian.yml index efa9cb8c10..7e0d174810 100644 --- a/contrib/gitian-descriptors/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml @@ -53,7 +53,7 @@ script: | cp $OUTDIR/src/COPYING $OUTDIR cd src sed 's/$(DEBUGFLAGS)//' -i makefile.unix - PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin USE_UPNP=1 - PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 + PATH=$INSTDIR/bin:$PATH make -f makefile.unix STATIC=1 CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin USE_UPNP=1 + PATH=$INSTDIR/bin:$PATH make -f makefile.unix STATIC=1 CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 mkdir -p $OUTDIR/bin/$GBUILD_BITS install -s bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS |