No OneTemporary
Actions

Size

17 KB

Subscribers

None

View Options

	diff --git a/contrib/gitian-descriptors/README b/contrib/gitian-descriptors/README
	index 66a0509ac..ad5a366d2 100644
	--- a/contrib/gitian-descriptors/README
	+++ b/contrib/gitian-descriptors/README
	@@ -1,86 +1,86 @@
	Gavin's notes on getting gitian builds up and running using KVM:

	These instructions distilled from:
	https://help.ubuntu.com/community/KVM/Installation
	... see there for complete details.

	You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization.

	You probably need to enable hardware virtualization in your machine's BIOS.

	You need to be running a recent version of 64-bit-Ubuntu, and you need to install several prerequisites:
	sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm

	Sanity checks:
	sudo service apt-cacher-ng status # Should return apt-cacher-ng is running
	ls -l /dev/kvm # Should show a /dev/kvm device


	Once you've got the right hardware and software:

	git clone git://github.com/bitcoin/bitcoin.git
	git clone git://github.com/devrandom/gitian-builder.git
	mkdir gitian-builder/inputs
	cd gitian-builder/inputs
	# Inputs for Linux and Win32:
	wget -O miniupnpc-1.6.tar.gz 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz'
	wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
	# Inputs for Win32: (Linux has packages for these)
	wget 'https://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
	wget 'http://www.openssl.org/source/openssl-1.0.1b.tar.gz'
	wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
	wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz'
	wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz'
	- wget 'ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz'
	+ wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz'
	cd ../..

	cd gitian-builder
	bin/make-base-vm --arch i386
	bin/make-base-vm --arch amd64
	cd ..

	# Build Linux release:
	cd bitcoin
	git pull
	cd ../gitian-builder
	git pull
	./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian.yml

	# Build Win32 dependencies: (only needs to be done once, or when dependency versions change)
	./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
	./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
	./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/qt-win32.yml

	# Build Win32 release:
	./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml

	---------------------

	gitian-builder now also supports building using LXC. See
	https://help.ubuntu.com/12.04/serverguide/lxc.html
	... for how to get LXC up and running under Ubuntu.

	If your main machine is a 64-bit Mac or PC with a few gigabytes of memory
	and at least 10 gigabytes of free disk space, you can gitian-build using
	LXC running inside a virtual machine.

	Here's a description of Gavin's setup on OSX 10.6:

	1. Download and install VirtualBox from https://www.virtualbox.org/

	2. Download the 64-bit Ubuntu Desktop 12.04 LTS .iso CD image from
	http://www.ubuntu.com/

	3. Run VirtualBox and create a new virtual machine, using the
	Ubuntu .iso (see the VirtualBox documentation for details).
	Create it with at least 2 gigabytes of memory and a disk
	that is at least 20 gigabytes big.

	4. Inside the running Ubuntu desktop, install:
	sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder

	5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right
	hardware and software" instructions above:
	export USE_LXC=1
	git clone git://github.com/bitcoin/bitcoin.git
	... etc
	diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml
	index 7948bbe45..fa6636f52 100644
	--- a/contrib/gitian-descriptors/gitian-win32.yml
	+++ b/contrib/gitian-descriptors/gitian-win32.yml
	@@ -1,74 +1,74 @@
	---
	name: "bitcoin"
	suites:
	- "lucid"
	architectures:
	- "i386"
	packages:
	- "mingw32"
	- "git-core"
	- "unzip"
	- "nsis"
	- "faketime"
	reference_datetime: "2011-01-30 00:00:00"
	remotes:
	- "url": "https://github.com/bitcoin/bitcoin.git"
	"dir": "bitcoin"
	files:
	-- "qt-win32-4.7.4-gitian-r1.zip"
	+- "qt-win32-4.8.2-gitian-r1.zip"
	- "boost-win32-1.50.0-gitian2.zip"
	- "bitcoin-deps-0.0.4.zip"
	script: \|
	#
	mkdir $HOME/qt
	cd $HOME/qt
	- unzip ../build/qt-win32-4.7.4-gitian-r1.zip
	+ unzip ../build/qt-win32-4.8.2-gitian-r1.zip
	cd $HOME/build/
	export PATH=$PATH:$HOME/qt/bin/
	#
	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.4.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 LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
	export FAKETIME=$REFERENCE_DATETIME
	export TZ=UTC
	$HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross 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.1b OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1b/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 QMAKE_LFLAGS=-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/
	diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml
	index fa3a84b32..87887dec8 100644
	--- a/contrib/gitian-descriptors/qt-win32.yml
	+++ b/contrib/gitian-descriptors/qt-win32.yml
	@@ -1,54 +1,54 @@
	---
	name: "qt"
	suites:
	- "lucid"
	architectures:
	- "i386"
	packages:
	- "mingw32"
	- "zip"
	- "faketime"
	reference_datetime: "2011-01-30 00:00:00"
	remotes: []
	files:
	-- "qt-everywhere-opensource-src-4.7.4.tar.gz"
	+- "qt-everywhere-opensource-src-4.8.2.tar.gz"
	script: \|
	INSTDIR="$HOME/qt/"
	mkdir $INSTDIR
	SRCDIR="$INSTDIR/src/"
	mkdir $SRCDIR
	#
	- tar xzf qt-everywhere-opensource-src-4.7.4.tar.gz
	- cd qt-everywhere-opensource-src-4.7.4
	+ tar xzf qt-everywhere-opensource-src-4.8.2.tar.gz
	+ cd qt-everywhere-opensource-src-4.8.2
	sed 's/$TODAY/2011-01-30/' -i configure
	sed 's/i686-pc-mingw32-/i586-mingw32msvc-/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
	sed --posix 's\|QMAKE_CFLAGS\t\t= -pipe\|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/i586-mingw32msvc/include/ -frandom-seed=qtbuild\|' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
	sed 's/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
	sed 's/QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads/QMAKE_LFLAGS_EXCEPTIONS_ON = -lmingwthrd/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
	sed --posix 's/QMAKE_MOC\t\t= i586-mingw32msvc-moc/QMAKE_MOC\t\t= moc/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
	sed --posix 's/QMAKE_RCC\t\t= i586-mingw32msvc-rcc/QMAKE_RCC\t\t= rcc/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
	sed --posix 's/QMAKE_UIC\t\t= i586-mingw32msvc-uic/QMAKE_UIC\t\t= uic/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
	# ar adds timestamps to every object file included in the static library
	# providing -D as ar argument is supposed to solve it, but doesn't work as qmake strips off the arguments and adds -M to pass a script...
	# which somehow cannot be combined with other flags.
	# use faketime only for ar, as it confuses make/qmake into hanging sometimes
	sed --posix "s\|QMAKE_LIB\t\t= i586-mingw32msvc-ar -ru\|QMAKE_LIB\t\t= $HOME/ar -Dr\|" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
	echo '#!/bin/bash' > $HOME/ar
	echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/ar
	echo 'i586-mingw32msvc-ar "$@"' >> $HOME/ar
	chmod +x $HOME/ar
	#export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
	export FAKETIME=$REFERENCE_DATETIME
	export TZ=UTC
	./configure -prefix $INSTDIR -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
	find . -name *.prl \| xargs -l sed 's\|/\.\|\|' -i
	find . -name *.prl \| xargs -l sed 's\|/$\|\|' -i
	make $MAKEOPTS install
	cp -a bin $SRCDIR/
	cd $INSTDIR
	find . -name *.prl \| xargs -l sed 's\|/$\|\|' -i
	#sed 's\|QMAKE_PRL_LIBS.*\|QMAKE_PRL_LIBS = -lQtDeclarative -lQtScript -lQtSvg -lQtSql -lQtXmlPatterns -lQtGui -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lmsimg32 -lQtNetwork -lQtCore -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32\|' -i imports/Qt/labs/particles/qmlparticlesplugin.prl

	# 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.7.4-gitian-r1.zip *
	+ zip -r $OUTDIR/qt-win32-4.8.2-gitian-r1.zip *
	diff --git a/doc/release-process.txt b/doc/release-process.txt
	index 8443961d2..c74bc3da1 100644
	--- a/doc/release-process.txt
	+++ b/doc/release-process.txt
	@@ -1,143 +1,143 @@
	* update translations (ping tcatm on IRC for now)

	* update (commit) version in sources
	bitcoin-qt.pro
	src/clientversion.h
	share/setup.nsi
	doc/README*

	* tag version in git

	git tag -a v0.5.1

	* write release notes. git shortlog helps a lot:

	git shortlog --no-merges v0.5.0..

	* perform gitian builds

	* From a directory containing the bitcoin source, gitian-builder and gitian.sigs
	export SIGNER=(your gitian key, ie bluematt, sipa, etc)
	export VERSION=0.5.1
	cd ./gitian-builder

	* Fetch and build inputs: (first time, or when dependency versions change)
	mkdir -p inputs; cd inputs/
	wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.6.tar.gz' -O miniupnpc-1.6.tar.gz
	wget 'http://www.openssl.org/source/openssl-1.0.1b.tar.gz'
	wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
	wget 'http://zlib.net/zlib-1.2.6.tar.gz'
	wget 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.9.tar.gz'
	wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
	wget 'http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
	- wget 'http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.4.tar.gz'
	+ wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz'
	cd ..
	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
	mv build/out/boost-win32-1.50.0-gitian2.zip inputs/
	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
	- mv build/out/qt-win32-4.7.4-gitian.zip inputs/
	+ mv build/out/qt-win32-4.8.2-gitian-r1.zip inputs/
	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
	mv build/out/bitcoin-deps-0.0.3.zip inputs/

	* Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml
	./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
	pushd build/out
	zip -r bitcoin-${VERSION}-linux-gitian.zip *
	mv bitcoin-${VERSION}-linux-gitian.zip ../../
	popd
	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
	./bin/gsign --signer $SIGNER --release ${VERSION}-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
	pushd build/out
	zip -r bitcoin-${VERSION}-win32-gitian.zip *
	mv bitcoin-${VERSION}-win32-gitian.zip ../../
	popd

	Build output expected:
	1. linux 32-bit and 64-bit binaries + source (bitcoin-${VERSION}-linux-gitian.zip)
	2. windows 32-bit binary, installer + source (bitcoin-${VERSION}-win32-gitian.zip)
	3. Gitian signatures (in gitian.sigs/${VERSION}[-win32]/(your gitian key)/

	* repackage gitian builds for release as stand-alone zip/tar/installer exe

	* Linux .tar.gz:
	unzip bitcoin-${VERSION}-linux-gitian.zip -d bitcoin-${VERSION}-linux
	tar czvf bitcoin-${VERSION}-linux.tar.gz bitcoin-${VERSION}-linux
	rm -rf bitcoin-${VERSION}-linux

	* Windows .zip and setup.exe:
	unzip bitcoin-${VERSION}-win32-gitian.zip -d bitcoin-${VERSION}-win32
	mv bitcoin-${VERSION}-win32/bitcoin-*-setup.exe .
	zip -r bitcoin-${VERSION}-win32.zip bitcoin-${VERSION}-win32
	rm -rf bitcoin-${VERSION}-win32

	* perform Mac build
	See this blog post for how Gavin set up his build environment to build the OSX
	release; note that a patched version of macdeployqt is not needed anymore, as
	the required functionality and fixes are implemented directly in macdeployqtplus:
	http://gavintech.blogspot.com/2011/11/deploying-bitcoin-qt-on-osx.html
	Gavin also had trouble with the macports py27-appscript package; he
	ended up installing a version that worked with: /usr/bin/easy_install-2.7 appscript

	qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 bitcoin-qt.pro
	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 contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist

	Build output expected:
	Bitcoin-Qt.dmg

	* upload builds to SourceForge

	* create SHA256SUMS for builds, and PGP-sign it

	* update bitcoin.org version
	make sure all OS download links go to the right versions

	* update forum version

	* update wiki download links

	* update wiki changelog: https://en.bitcoin.it/wiki/Changelog

	* Commit your signature to gitian.sigs:
	pushd gitian.sigs
	git add ${VERSION}/${SIGNER}
	git add ${VERSION}-win32/${SIGNER}
	git commit -a
	git push # Assuming you can push to the gitian.sigs tree
	popd

	-------------------------------------------------------------------------

	* After 3 or more people have gitian-built, repackage gitian-signed zips:

	* From a directory containing bitcoin source, gitian.sigs and gitian zips
	export VERSION=0.5.1
	mkdir bitcoin-${VERSION}-linux-gitian
	pushd bitcoin-${VERSION}-linux-gitian
	unzip ../bitcoin-${VERSION}-linux-gitian.zip
	mkdir gitian
	cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
	for signer in $(ls ../gitian.sigs/${VERSION}/); do
	cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
	cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
	done
	zip -r bitcoin-${VERSION}-linux-gitian.zip *
	cp bitcoin-${VERSION}-linux-gitian.zip ../
	popd
	mkdir bitcoin-${VERSION}-win32-gitian
	pushd bitcoin-${VERSION}-win32-gitian
	unzip ../bitcoin-${VERSION}-win32-gitian.zip
	mkdir gitian
	cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
	for signer in $(ls ../gitian.sigs/${VERSION}-win32/); do
	cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
	cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
	done
	zip -r bitcoin-${VERSION}-win32-gitian.zip *
	cp bitcoin-${VERSION}-win32-gitian.zip ../
	popd

	* Upload gitian zips to SourceForge

File Metadata

Mime Type: text/x-diff
Expires: Sun, Mar 2, 12:11 (20 h, 47 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5179551
Default Alt Text: (17 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions