diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/bitcoin-qt.pro | 17 | ||||
-rw-r--r-- | contrib/gitian-descriptors/boost-win32.yml | 19 | ||||
-rw-r--r-- | contrib/gitian-descriptors/deps-win32.yml | 38 | ||||
-rw-r--r-- | contrib/gitian-descriptors/gitian-win32.yml | 85 | ||||
-rw-r--r-- | contrib/gitian-descriptors/gitian.yml | 38 | ||||
-rw-r--r-- | contrib/gitian-descriptors/protobuf-win32.yml | 20 | ||||
-rw-r--r-- | contrib/gitian-descriptors/qt-win32.yml | 10 | ||||
-rwxr-xr-x | contrib/macdeploy/macdeployqtplus | 17 | ||||
-rw-r--r-- | contrib/macdeploy/notes.txt | 24 |
9 files changed, 143 insertions, 125 deletions
diff --git a/contrib/bitcoin-qt.pro b/contrib/bitcoin-qt.pro new file mode 100644 index 0000000000..0b181ef449 --- /dev/null +++ b/contrib/bitcoin-qt.pro @@ -0,0 +1,17 @@ +FORMS += \ + ../src/qt/forms/transactiondescdialog.ui \ + ../src/qt/forms/signverifymessagedialog.ui \ + ../src/qt/forms/sendcoinsentry.ui \ + ../src/qt/forms/sendcoinsdialog.ui \ + ../src/qt/forms/rpcconsole.ui \ + ../src/qt/forms/qrcodedialog.ui \ + ../src/qt/forms/overviewpage.ui \ + ../src/qt/forms/optionsdialog.ui \ + ../src/qt/forms/intro.ui \ + ../src/qt/forms/editaddressdialog.ui \ + ../src/qt/forms/askpassphrasedialog.ui \ + ../src/qt/forms/addressbookpage.ui \ + ../src/qt/forms/aboutdialog.ui + +RESOURCES += \ + ../src/qt/bitcoin.qrc diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml index 1eeb9eaa28..b31a49760b 100644 --- a/contrib/gitian-descriptors/boost-win32.yml +++ b/contrib/gitian-descriptors/boost-win32.yml @@ -13,8 +13,8 @@ remotes: [] files: - "boost_1_50_0.tar.bz2" script: | - TMPDIR="$HOME/tmpdir" - mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include + INSTALLPREFIX="$OUTDIR/staging/boost" + mkdir -p "$INSTALLPREFIX" tar xjf boost_1_50_0.tar.bz2 cd boost_1_50_0 echo "using gcc : 4.4 : i586-mingw32msvc-g++ @@ -24,15 +24,10 @@ script: | <cxxflags>-frandom-seed=boost1 ;" > user-config.jam ./bootstrap.sh --without-icu - ./bjam toolset=gcc target-os=windows threadapi=win32 threading=multi variant=release link=static --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 -sNO_ZLIB=1 --layout=tagged --build-type=complete $MAKEOPTS stage - for lib in chrono date_time exception filesystem graph iostreams math_c99f math_c99l math_c99 math_tr1f math_tr1l math_tr1 prg_exec_monitor program_options random regex serialization signals system test_exec_monitor thread_win32 unit_test_framework wave wserialization; do - mkdir $lib - (cd $lib ; ar xf ../stage/lib/libboost_${lib}-mt-s.a) - mv $lib $TMPDIR/bin/$GBUILD_BITS - done - cp -a boost $TMPDIR/include - cd $TMPDIR + ./bjam toolset=gcc target-os=windows threadapi=win32 threading=multi variant=release link=static --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 -sNO_ZLIB=1 --layout=tagged --build-type=complete --prefix="$INSTALLPREFIX" $MAKEOPTS install + + cd "$INSTALLPREFIX" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME - zip -r boost-win32-1.50.0-gitian2.zip * - cp boost-win32-1.50.0-gitian2.zip $OUTDIR + zip -r boost-win32-1.50.0-gitian3.zip * + cp boost-win32-1.50.0-gitian3.zip $OUTDIR diff --git a/contrib/gitian-descriptors/deps-win32.yml b/contrib/gitian-descriptors/deps-win32.yml index 90f4c6c4be..98f69dddf0 100644 --- a/contrib/gitian-descriptors/deps-win32.yml +++ b/contrib/gitian-descriptors/deps-win32.yml @@ -25,48 +25,58 @@ script: | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC + export INSTALLPREFIX=$OUTDIR/staging/deps + export HOST=i586-mingw32msvc # + mkdir -p $INSTALLPREFIX + tar xzf openssl-1.0.1c.tar.gz cd openssl-1.0.1c - ./Configure --cross-compile-prefix=i586-mingw32msvc- mingw + ./Configure --cross-compile-prefix=$HOST- mingw --openssldir=$INSTALLPREFIX make + make install_sw cd .. # tar xzf db-4.8.30.NC.tar.gz cd db-4.8.30.NC/build_unix - ../dist/configure --enable-mingw --enable-cxx --host=i586-mingw32msvc CFLAGS="-I/usr/i586-mingw32msvc/include" - make $MAKEOPTS + ../dist/configure --prefix=$INSTALLPREFIX --enable-mingw --enable-cxx --host=$HOST + make $MAKEOPTS library_build + make install_lib install_include cd ../.. # tar xzf miniupnpc-1.6.tar.gz cd miniupnpc-1.6 sed 's/dllwrap -k --driver-name gcc/$(DLLWRAP) -k --driver-name $(CC)/' -i Makefile.mingw sed 's|wingenminiupnpcstrings $< $@|./wingenminiupnpcstrings $< $@|' -i Makefile.mingw - make -f Makefile.mingw DLLWRAP=i586-mingw32msvc-dllwrap CC=i586-mingw32msvc-gcc AR=i586-mingw32msvc-ar + mkdir -p dll + make -f Makefile.mingw DLLWRAP=$HOST-dllwrap CC=$HOST-gcc AR=$HOST-ar libminiupnpc.a + install -d $INSTALLPREFIX/include/miniupnpc + install *.h $INSTALLPREFIX/include/miniupnpc + install libminiupnpc.a $INSTALLPREFIX/lib cd .. - mv miniupnpc-1.6 miniupnpc # tar xzf zlib-1.2.6.tar.gz cd zlib-1.2.6 - make -f win32/Makefile.gcc PREFIX=i586-mingw32msvc- $MAKEOPTS + CROSS_PREFIX=$HOST- ./configure --prefix=$INSTALLPREFIX --static + make + make install cd .. # tar xzf libpng-1.5.9.tar.gz cd libpng-1.5.9 - ./configure -disable-shared CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld LDFLAGS="-L../zlib-1.2.6/" CFLAGS="-I../zlib-1.2.6/" + CFLAGS="-I$INSTALLPREFIX/include" LDFLAGS="-L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST make $MAKEOPTS + make install cd .. # tar xjf qrencode-3.2.0.tar.bz2 cd qrencode-3.2.0 - ./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld png_LIBS="../libpng-1.5.9/.libs/libpng15.a ../zlib-1.2.6/libz.a" png_CFLAGS="-I../libpng-1.5.9" - make $MAKEOPTS + png_CFLAGS="-I$INSTALLPREFIX/include" png_LIBS="-L$INSTALLPREFIX/lib -lpng" ./configure --prefix=$INSTALLPREFIX --host=i586-mingw32msvc + make + make install cd .. # - zip -r $OUTDIR/bitcoin-deps-0.0.5.zip \ - $(ls qrencode-*/{qrencode.h,.libs/libqrencode.{,l}a} | sort) \ - $(ls db-*/build_unix/{libdb_cxx.a,db.h,db_cxx.h,libdb.a,.libs/libdb_cxx-?.?.a} | sort) \ - $(find openssl-* -name '*.a' -o -name '*.h' | sort) \ - $(find miniupnpc -name '*.h' -o -name 'libminiupnpc.a' | sort) + cd $INSTALLPREFIX + zip -r $OUTDIR/bitcoin-deps-0.0.6.zip include lib # Kill wine processes as gitian won't figure out we are done otherwise killall wineserver services.exe explorer.exe winedevice.exe diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml index 5fc5a5a16b..04643c1522 100644 --- a/contrib/gitian-descriptors/gitian-win32.yml +++ b/contrib/gitian-descriptors/gitian-win32.yml @@ -10,69 +10,48 @@ packages: - "unzip" - "nsis" - "faketime" -reference_datetime: "2011-01-30 00:00:00" +- "autoconf2.13" +- "libtool" +- "automake" +- "pkg-config" + +reference_datetime: "2013-06-01 00:00:00" remotes: - "url": "https://github.com/bitcoin/bitcoin.git" "dir": "bitcoin" files: -- "qt-win32-4.8.3-gitian-r2.zip" -- "boost-win32-1.50.0-gitian2.zip" -- "bitcoin-deps-0.0.5.zip" -- "protobuf-win32-2.5.0-gitian-r1.zip" +- "qt-win32-4.8.3-gitian-r3.zip" +- "boost-win32-1.50.0-gitian3.zip" +- "bitcoin-deps-0.0.6.zip" +- "protobuf-win32-2.5.0-gitian-r2.zip" script: | # - export QTDIR=$HOME/qt - mkdir $QTDIR - cd $QTDIR - unzip ../build/qt-win32-4.8.3-gitian-r2.zip + STAGING=$HOME/staging + mkdir -p $STAGING + cd $STAGING + unzip ../build/qt-win32-4.8.3-gitian-r3.zip + unzip ../build/boost-win32-1.50.0-gitian3.zip + unzip ../build/bitcoin-deps-0.0.6.zip + unzip ../build/protobuf-win32-2.5.0-gitian-r2.zip cd $HOME/build/ - export PATH=$QTDIR/bin/:$PATH - # - mkdir boost_1_50_0 - cd boost_1_50_0 - mkdir -p stage/lib - unzip ../boost-win32-1.50.0-gitian2.zip - cd bin/$GBUILD_BITS - for lib in *; do - i586-mingw32msvc-ar rc ../../stage/lib/libboost_${lib}-mt-s.a $lib/*.o - i586-mingw32msvc-ranlib ../../stage/lib/libboost_${lib}-mt-s.a - done - cd ../.. - mv include/boost . - cd .. - # - unzip bitcoin-deps-0.0.5.zip - # - unzip protobuf-win32-2.5.0-gitian-r1.zip - # - find -type f | xargs touch --date="$REFERENCE_DATETIME" # cd bitcoin - mkdir -p $OUTDIR/src - git archive HEAD | tar -x -C $OUTDIR/src - cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt - cp $OUTDIR/src/COPYING $OUTDIR/COPYING.txt + export PATH=$STAGING/host/bin:$PATH + export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'` + ./autogen.sh + ./configure --disable-debug --bindir=$OUTDIR --prefix=$STAGING --host=i586-mingw32msvc --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin" + make dist + mkdir -p distsrc + cd distsrc + tar --strip-components=1 -xf ../bitcoin-*.tar.* + ./configure --disable-debug --bindir=$OUTDIR --prefix=$STAGING --host=i586-mingw32msvc --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC - $QTDIR/bin/qmake -spec unsupported/win32-g++-cross PROTOBUF_LIB_PATH=$HOME/build/protobuf-win32 PROTOBUF_INCLUDE_PATH=$HOME/build/protobuf-win32 PROTOC=$HOME/build/protobuf-win32/protoc MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_50_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_50_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.1c OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1c/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin USE_BUILD_INFO=1 make $MAKEOPTS - cp release/bitcoin-qt.exe $OUTDIR/ - # - cd src - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME - export TZ=UTC - make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_UPNP=0 DEBUGFLAGS="-frandom-seed=bitcoin" - i586-mingw32msvc-strip bitcoind.exe - mkdir $OUTDIR/daemon - cp bitcoind.exe $OUTDIR/daemon - cd .. - mkdir nsis - git archive HEAD | tar -x -C nsis - cd nsis/src - mkdir ../release - cp ../../release/* ../release/ - cp ../../src/*.exe . - makensis ../share/setup.nsi - cp ../share/bitcoin-*-win32-setup.exe $OUTDIR/ + make deploy + make install-strip + cp -f bitcoin-*setup*.exe $OUTDIR/ + + mkdir -p $OUTDIR/src + cp -f ../bitcoin-*.tar.* $OUTDIR/src diff --git a/contrib/gitian-descriptors/gitian.yml b/contrib/gitian-descriptors/gitian.yml index 6d47a46d5a..47704bea29 100644 --- a/contrib/gitian-descriptors/gitian.yml +++ b/contrib/gitian-descriptors/gitian.yml @@ -13,11 +13,16 @@ packages: - "libboost-filesystem-dev" - "libboost-program-options-dev" - "libboost-thread-dev" +- "libboost-test-dev" - "libssl-dev" - "git-core" - "unzip" - "pkg-config" - "libpng12-dev" +- "autoconf2.13" +- "libtool" +- "automake" +- "faketime" reference_datetime: "2013-06-01 00:00:00" remotes: - "url": "https://github.com/bitcoin/bitcoin.git" @@ -27,35 +32,38 @@ files: - "qrencode-3.2.0.tar.bz2" - "protobuf-2.5.0.tar.bz2" script: | - INSTDIR="$HOME/install" - export LIBRARY_PATH="$INSTDIR/lib" + STAGING="$HOME/install" + export LIBRARY_PATH="$STAGING/lib" # tar xzfm miniupnpc-1.6.tar.gz cd miniupnpc-1.6 - INSTALLPREFIX=$INSTDIR make $MAKEOPTS install + INSTALLPREFIX=$STAGING make $MAKEOPTS install cd .. # tar xjfm qrencode-3.2.0.tar.bz2 cd qrencode-3.2.0 - ./configure --prefix=$INSTDIR --enable-static --disable-shared + sed -i 's/@LIBPTHREAD@//' libqrencode.pc.in + ./configure --prefix=$STAGING --enable-static --disable-shared make $MAKEOPTS install cd .. # tar xjfm protobuf-2.5.0.tar.bz2 cd protobuf-2.5.0 - ./configure --prefix=$INSTDIR --enable-static --disable-shared + mkdir -p $STAGING/host/bin + ./configure --prefix=$STAGING --bindir=$STAGING/host/bin --enable-static --disable-shared make $MAKEOPTS install cd .. # cd bitcoin - mkdir -p $OUTDIR/src - git archive HEAD | tar -x -C $OUTDIR/src - cp $OUTDIR/src/doc/README.md $OUTDIR - cp $OUTDIR/src/COPYING $OUTDIR - mkdir -p $OUTDIR/bin/$GBUILD_BITS - qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" PROTOC="$INSTDIR/bin/protoc" PROTOBUF_LIB_PATH="$INSTDIR/lib" PROTOBUF_INCLUDE_PATH="$INSTDIR/include" RELEASE=1 USE_QRCODE=1 + export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'` + ./autogen.sh + ./configure --disable-debug --prefix=$STAGING --bindir=$OUTDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin" + make dist + mkdir -p distsrc + cd distsrc + tar --strip-components=1 -xf ../bitcoin-*.tar.* + ./configure --disable-debug --prefix=$STAGING --bindir=$OUTDIR --with-protoc-bindir=$STAGING/host/bin --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include" LDFLAGS="-L$STAGING/lib" CXXFLAGS="-frandom-seed=bitcoin" make $MAKEOPTS - install bitcoin-qt $OUTDIR/bin/$GBUILD_BITS - cd src - make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 DEBUGFLAGS= - install -s bitcoind $OUTDIR/bin/$GBUILD_BITS + make $MAKEOPTS install-strip + mkdir -p $OUTDIR/src + cp ../bitcoin-*.tar.* $OUTDIR/src diff --git a/contrib/gitian-descriptors/protobuf-win32.yml b/contrib/gitian-descriptors/protobuf-win32.yml index 492b21e7f5..ad676e5654 100644 --- a/contrib/gitian-descriptors/protobuf-win32.yml +++ b/contrib/gitian-descriptors/protobuf-win32.yml @@ -17,21 +17,23 @@ script: | export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC + export INSTALLPREFIX=$OUTDIR/staging/deps + export HOST=i586-mingw32msvc # + # + mkdir -p $INSTALLPREFIX + tar xjf protobuf-2.5.0.tar.bz2 cd protobuf-2.5.0 # First: build a native (linux) protoc ./configure --enable-shared=no --disable-dependency-tracking make - mkdir -p host - cp src/protoc host + mkdir -p $INSTALLPREFIX/host/bin + cp src/protoc $INSTALLPREFIX/host/bin # Now recompile with the mingw cross-compiler: make distclean - ./configure --enable-shared=no --disable-dependency-tracking --with-protoc=$(pwd)/host/protoc --host=i586-mingw32msvc CXXFLAGS=-frandom-seed=11 + ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS=-frandom-seed=11 make - cd .. - mkdir -p protobuf-win32 - cp protobuf-2.5.0/host/protoc protobuf-win32/protoc - cp protobuf-2.5.0/src/.libs/libprotobuf.a protobuf-win32/libprotobuf.a - cp -r protobuf-2.5.0/src/google protobuf-win32/ - zip -r $OUTDIR/protobuf-win32-2.5.0-gitian-r1.zip protobuf-win32 + make install + cd $INSTALLPREFIX + zip -r $OUTDIR/protobuf-win32-2.5.0-gitian-r2.zip include lib host diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml index 2ed489bcc4..2bb5113d16 100644 --- a/contrib/gitian-descriptors/qt-win32.yml +++ b/contrib/gitian-descriptors/qt-win32.yml @@ -9,17 +9,19 @@ packages: - "zip" - "unzip" - "faketime" +- "unzip" reference_datetime: "2011-01-30 00:00:00" remotes: [] files: - "qt-everywhere-opensource-src-4.8.3.tar.gz" -- "bitcoin-deps-0.0.5.zip" +- "bitcoin-deps-0.0.6.zip" script: | INSTDIR="$HOME/qt/" mkdir $INSTDIR + mkdir -p $INSTDIR/host/bin # # Need mingw-compiled openssl from bitcoin-deps: - unzip bitcoin-deps-0.0.5.zip + unzip bitcoin-deps-0.0.6.zip DEPSDIR=`pwd` # tar xzf qt-everywhere-opensource-src-4.8.3.tar.gz @@ -45,7 +47,7 @@ script: | export FAKETIME=$REFERENCE_DATETIME export TZ=UTC # Compile static libraries, and use statically linked openssl (-openssl-linked): - OPENSSL_LIBS="-L$DEPSDIR/openssl-1.0.1c -lssl -lcrypto -lgdi32" ./configure -prefix $INSTDIR -I $DEPSDIR/openssl-1.0.1c/include -confirm-license -release -opensource -static -no-qt3support -xplatform unsupported/win32-g++-cross -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -no-opengl -nomake examples -nomake demos -nomake docs -no-feature-style-plastique -no-feature-style-cleanlooks -no-feature-style-motif -no-feature-style-cde -no-feature-style-windowsce -no-feature-style-windowsmobile -no-feature-style-s60 -openssl-linked + OPENSSL_LIBS="-L$DEPSDIR/lib -lssl -lcrypto -lgdi32" ./configure -prefix $INSTDIR -bindir $INSTDIR/host/bin -I $DEPSDIR/include -confirm-license -release -opensource -static -no-qt3support -xplatform unsupported/win32-g++-cross -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -no-opengl -nomake examples -nomake demos -nomake docs -no-feature-style-plastique -no-feature-style-cleanlooks -no-feature-style-motif -no-feature-style-cde -no-feature-style-windowsce -no-feature-style-windowsmobile -no-feature-style-s60 -openssl-linked find . -name *.prl | xargs -l sed 's|/\.||' -i find . -name *.prl | xargs -l sed 's|/$||' -i make $MAKEOPTS install @@ -54,4 +56,4 @@ script: | # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - zip -r $OUTDIR/qt-win32-4.8.3-gitian-r2.zip * + zip -r $OUTDIR/qt-win32-4.8.3-gitian-r3.zip * diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 11140d3b85..533be6cffa 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -651,6 +651,23 @@ elif config.sign: # ------------------------------------------------ if config.dmg is not None: + + #Patch in check_output for Python 2.6 + if "check_output" not in dir( subprocess ): + def f(*popenargs, **kwargs): + if 'stdout' in kwargs: + raise ValueError('stdout argument not allowed, it will be overridden.') + process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs) + output, unused_err = process.communicate() + retcode = process.poll() + if retcode: + cmd = kwargs.get("args") + if cmd is None: + cmd = popenargs[0] + raise CalledProcessError(retcode, cmd) + return output + subprocess.check_output = f + def runHDIUtil(verb, image_basename, **kwargs): hdiutil_args = ["hdiutil", verb, image_basename + ".dmg"] if kwargs.has_key("capture_stdout"): diff --git a/contrib/macdeploy/notes.txt b/contrib/macdeploy/notes.txt index 3d74901437..e7f62c4a39 100644 --- a/contrib/macdeploy/notes.txt +++ b/contrib/macdeploy/notes.txt @@ -1,26 +1,14 @@ - -macdeployqtplus works best on OS X Lion, for Snow Leopard you'd need to install -Python 2.7 and make it your default Python installation. - You will need the appscript package for the fancy disk image creation to work. Install it by invoking "sudo easy_install appscript". -This script should be invoked in the target directory like this: -$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist -verbose 2 +For Snow Leopard (which uses Python 2.6), you will need the param_parser package. +Install it by invoking "sudo easy_install argparse" + +This script should not be run manually, instead, after building as usual: +"make deploy" During the process, the disk image window will pop up briefly where the fancy settings are applied. This is normal, please do not interfere. -You can also set up Qt Creator for invoking the script. For this, go to the -"Projects" tab on the left side, switch to "Run Settings" above and add a -deploy configuration. Next add a deploy step choosing "Custom Process Step". -Fill in the following. - -Enable custom process step: [x] -Command: %{sourceDir}/contrib/macdeploy/macdeployqtplus -Working directory: %{buildDir} -Command arguments: Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist -verbose 2 - -After that you can start the deployment process through the menu with -Build -> Deploy Project "bitcoin-qt" +When finished, it will produce Bitcoin-Qt.dmg. |