diff options
| -rw-r--r-- | contrib/gitian.yml | 15 | ||||
| -rw-r--r-- | serialize.h | 2 | ||||
| -rw-r--r-- | setup.nsi | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/contrib/gitian.yml b/contrib/gitian.yml index 92385e50b2..5d12f72700 100644 --- a/contrib/gitian.yml +++ b/contrib/gitian.yml @@ -18,20 +18,29 @@ remotes: "dir": "bitcoin" files: - "wxWidgets-2.9.1.tar.bz2" +- "miniupnpc-1.5.tar.gz" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" + # + tar xzf miniupnpc-1.5.tar.gz + cd miniupnpc-1.5 + INSTALLPREFIX=$INSTDIR make $MAKEOPTS install + cd .. + # tar xjf wxWidgets-2.9.1.tar.bz2 cd wxWidgets-2.9.1 ./configure --prefix=$INSTDIR --enable-monolithic --disable-shared perl -i -p -e "s/__TIME__/\"$REFERENCE_TIME\"/;s/__DATE__/\"$REFERENCE_DATE\"/" include/wx/chartype.h make $MAKEOPTS install - cd ../bitcoin + cd .. + # + cd bitcoin mkdir -p $OUTDIR/src cp -a . $OUTDIR/src rm -rf $OUTDIR/src/.git mv $OUTDIR/src/locale $OUTDIR cp $OUTDIR/src/license.txt $OUTDIR - make -f makefile.unix $MAKEOPTS WXLIBS="-Wl,-Bstatic -l wx_gtk2u-2.9 -Wl,-Bdynamic -l gtk-x11-2.0 -l SM -l Xxf86vm" INCLUDEPATHS="`$INSTDIR/bin/wx-config --cflags`" bitcoin bitcoind + PATH=$INSTDIR/bin:$PATH make -f makefile.unix CXX="g++ -I$INSTDIR/include -L$INSTDIR/lib" $MAKEOPTS bitcoin bitcoind mkdir -p $OUTDIR/bin/$GBUILD_BITS - cp bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS + install -s bitcoin bitcoind $OUTDIR/bin/$GBUILD_BITS diff --git a/serialize.h b/serialize.h index 383c987864..ee39c0703d 100644 --- a/serialize.h +++ b/serialize.h @@ -25,7 +25,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 32100; +static const int VERSION = 32200; static const char* pszSubVer = ""; static const bool VERSION_IS_BETA = true; @@ -4,7 +4,7 @@ RequestExecutionLevel highest # General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.3.21
+!define VERSION 0.3.22
!define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/
@@ -39,12 +39,12 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile bitcoin-0.3.21-win32-setup.exe
+OutFile bitcoin-0.3.22-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
ShowInstDetails show
-VIProductVersion 0.3.21.0
+VIProductVersion 0.3.22.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
|