maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch '1.7.1-dev' into 1.7-maint

Browse source
This commit is contained in:
langerhans 2014-06-08 17:18:50 +02:00
parent 20c2a7ecbb 9139de4236
commit cf82699013
8 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60]) AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 7) define(_CLIENT_VERSION_MINOR, 7)
define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true) define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2014) define(_COPYRIGHT_YEAR, 2014)

10
contrib/gitian-descriptors/deps-linux.yml
View file

@ -16,7 +16,7 @@ packages:
reference_datetime: "2013-06-01 00:00:00" reference_datetime: "2013-06-01 00:00:00"
remotes: [] remotes: []
files: files:
- "openssl-1.0.1g.tar.gz" - "openssl-1.0.1h.tar.gz"
- "miniupnpc-1.8.tar.gz" - "miniupnpc-1.8.tar.gz"
- "qrencode-3.4.3.tar.bz2" - "qrencode-3.4.3.tar.bz2"
- "protobuf-2.5.0.tar.bz2" - "protobuf-2.5.0.tar.bz2"
@ -30,15 +30,15 @@ script: |
export TZ=UTC export TZ=UTC
export LIBRARY_PATH="$STAGING/lib" export LIBRARY_PATH="$STAGING/lib"
# Integrity Check # Integrity Check
echo "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 openssl-1.0.1g.tar.gz" | sha256sum -c echo "9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 openssl-1.0.1h.tar.gz" | sha256sum -c
echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c
echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c
echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c
echo "08238e59736d1aacdd47cfb8e68684c695516c37f4fbe1b8267dde58dc3a576c db-5.1.29.NC.tar.gz" | sha256sum -c echo "08238e59736d1aacdd47cfb8e68684c695516c37f4fbe1b8267dde58dc3a576c db-5.1.29.NC.tar.gz" | sha256sum -c
# #
tar xzf openssl-1.0.1g.tar.gz tar xzf openssl-1.0.1h.tar.gz
cd openssl-1.0.1g cd openssl-1.0.1h
# need -fPIC to avoid relocation error in 64 bit builds # need -fPIC to avoid relocation error in 64 bit builds
./config no-shared no-zlib no-dso no-krb5 --openssldir=$STAGING -fPIC ./config no-shared no-zlib no-dso no-krb5 --openssldir=$STAGING -fPIC
# need to build OpenSSL with faketime because a timestamp is embedded into cversion.o # need to build OpenSSL with faketime because a timestamp is embedded into cversion.o
@ -95,4 +95,4 @@ script: |
done done
# #
cd $STAGING cd $STAGING
find include lib bin host | sort | zip -X@ $OUTDIR/dogecoin-deps-linux${GBUILD_BITS}-gitian-r4.zip find include lib bin host | sort | zip -X@ $OUTDIR/dogecoin-deps-linux${GBUILD_BITS}-gitian-r4a.zip

10
contrib/gitian-descriptors/deps-win.yml
View file

@ -14,7 +14,7 @@ packages:
reference_datetime: "2011-01-30 00:00:00" reference_datetime: "2011-01-30 00:00:00"
remotes: [] remotes: []
files: files:
- "openssl-1.0.1g.tar.gz" - "openssl-1.0.1h.tar.gz"
- "db-5.1.29.NC.tar.gz" - "db-5.1.29.NC.tar.gz"
- "miniupnpc-1.8.tar.gz" - "miniupnpc-1.8.tar.gz"
- "zlib-1.2.8.tar.gz" - "zlib-1.2.8.tar.gz"
@ -28,7 +28,7 @@ script: |
INDIR=$HOME/build INDIR=$HOME/build
TEMPDIR=$HOME/tmp TEMPDIR=$HOME/tmp
# Input Integrity Check # Input Integrity Check
echo "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 openssl-1.0.1g.tar.gz" | sha256sum -c echo "9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 openssl-1.0.1h.tar.gz" | sha256sum -c
echo "08238e59736d1aacdd47cfb8e68684c695516c37f4fbe1b8267dde58dc3a576c db-5.1.29.NC.tar.gz" | sha256sum -c echo "08238e59736d1aacdd47cfb8e68684c695516c37f4fbe1b8267dde58dc3a576c db-5.1.29.NC.tar.gz" | sha256sum -c
echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c
echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c
@ -48,8 +48,8 @@ script: |
mkdir -p $INSTALLPREFIX $BUILDDIR mkdir -p $INSTALLPREFIX $BUILDDIR
cd $BUILDDIR cd $BUILDDIR
# #
tar xzf $INDIR/openssl-1.0.1g.tar.gz tar xzf $INDIR/openssl-1.0.1h.tar.gz
cd openssl-1.0.1g cd openssl-1.0.1h
if [ "$BITS" == "32" ]; then if [ "$BITS" == "32" ]; then
OPENSSL_TGT=mingw OPENSSL_TGT=mingw
else else
@ -126,5 +126,5 @@ script: |
done done
# #
cd $INSTALLPREFIX cd $INSTALLPREFIX
find include lib | sort | zip -X@ $OUTDIR/dogecoin-deps-win$BITS-gitian-r11.zip find include lib | sort | zip -X@ $OUTDIR/dogecoin-deps-win$BITS-gitian-r11a.zip
done # for BITS in done # for BITS in

6
contrib/gitian-descriptors/gitian-linux.yml
View file

@ -21,8 +21,8 @@ remotes:
- "url": "https://github.com/dogecoin/dogecoin.git" - "url": "https://github.com/dogecoin/dogecoin.git"
"dir": "dogecoin" "dir": "dogecoin"
files: files:
- "dogecoin-deps-linux32-gitian-r4.zip" - "dogecoin-deps-linux32-gitian-r4a.zip"
- "dogecoin-deps-linux64-gitian-r4.zip" - "dogecoin-deps-linux64-gitian-r4a.zip"
- "boost-linux32-1.55.0-gitian-r1.zip" - "boost-linux32-1.55.0-gitian-r1.zip"
- "boost-linux64-1.55.0-gitian-r1.zip" - "boost-linux64-1.55.0-gitian-r1.zip"
script: | script: |
@ -36,7 +36,7 @@ script: |
# #
mkdir -p $STAGING mkdir -p $STAGING
cd $STAGING cd $STAGING
unzip ../build/dogecoin-deps-linux${GBUILD_BITS}-gitian-r4.zip unzip ../build/dogecoin-deps-linux${GBUILD_BITS}-gitian-r4a.zip
unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip
cd ../build cd ../build

6
contrib/gitian-descriptors/gitian-win.yml
View file

@ -26,8 +26,8 @@ files:
- "qt-win64-5.2.0-gitian-r3.zip" - "qt-win64-5.2.0-gitian-r3.zip"
- "boost-win32-1.55.0-gitian-r6.zip" - "boost-win32-1.55.0-gitian-r6.zip"
- "boost-win64-1.55.0-gitian-r6.zip" - "boost-win64-1.55.0-gitian-r6.zip"
- "dogecoin-deps-win32-gitian-r11.zip" - "dogecoin-deps-win32-gitian-r11a.zip"
- "dogecoin-deps-win64-gitian-r11.zip" - "dogecoin-deps-win64-gitian-r11a.zip"
- "protobuf-win32-2.5.0-gitian-r4.zip" - "protobuf-win32-2.5.0-gitian-r4.zip"
- "protobuf-win64-2.5.0-gitian-r4.zip" - "protobuf-win64-2.5.0-gitian-r4.zip"
script: | script: |
@ -61,7 +61,7 @@ script: |
cd $STAGING cd $STAGING
unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip
unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip
unzip $INDIR/dogecoin-deps-win${BITS}-gitian-r11.zip unzip $INDIR/dogecoin-deps-win${BITS}-gitian-r11a.zip
unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip
if [ "$NEEDDIST" == "1" ]; then if [ "$NEEDDIST" == "1" ]; then
# Make source code archive which is architecture independent so it only needs to be done once # Make source code archive which is architecture independent so it only needs to be done once

6
contrib/gitian-descriptors/qt-win.yml
View file

@ -15,8 +15,8 @@ reference_datetime: "2011-01-30 00:00:00"
remotes: [] remotes: []
files: files:
- "qt-everywhere-opensource-src-5.2.0.tar.gz" - "qt-everywhere-opensource-src-5.2.0.tar.gz"
- "dogecoin-deps-win32-gitian-r11.zip" - "dogecoin-deps-win32-gitian-r11a.zip"
- "dogecoin-deps-win64-gitian-r11.zip" - "dogecoin-deps-win64-gitian-r11a.zip"
script: | script: |
# Defines # Defines
export TZ=UTC export TZ=UTC
@ -48,7 +48,7 @@ script: |
# #
# Need mingw-compiled openssl from dogecoin-deps: # Need mingw-compiled openssl from dogecoin-deps:
cd $DEPSDIR cd $DEPSDIR
unzip $INDIR/dogecoin-deps-win${BITS}-gitian-r11.zip unzip $INDIR/dogecoin-deps-win${BITS}-gitian-r11a.zip
# #
cd $BUILDDIR cd $BUILDDIR
# #

2
doc/release-process.md
View file

@ -40,7 +40,7 @@ Release Process
mkdir -p inputs; cd inputs/ mkdir -p inputs; cd inputs/
wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.8.tar.gz' -O miniupnpc-1.8.tar.gz wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.8.tar.gz' -O miniupnpc-1.8.tar.gz
wget 'https://www.openssl.org/source/openssl-1.0.1g.tar.gz' wget 'https://www.openssl.org/source/openssl-1.0.1h.tar.gz'
wget 'http://download.oracle.com/berkeley-db/db-5.1.29.NC.tar.gz' wget 'http://download.oracle.com/berkeley-db/db-5.1.29.NC.tar.gz'
wget 'http://zlib.net/zlib-1.2.8.tar.gz' wget 'http://zlib.net/zlib-1.2.8.tar.gz'
wget 'ftp://ftp.simplesystems.org/pub/png/src/history/libpng16/libpng-1.6.8.tar.gz' wget 'ftp://ftp.simplesystems.org/pub/png/src/history/libpng16/libpng-1.6.8.tar.gz'

2
src/clientversion.h
View file

@ -11,7 +11,7 @@
// These need to be macros, as version.cpp's and dogecoin-qt.rc's voodoo requires it // These need to be macros, as version.cpp's and dogecoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 7 #define CLIENT_VERSION_MINOR 7
#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 0 #define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build // Set to true for release, false for prerelease or test build