Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V12.3.1D #19

Merged
merged 45 commits into from
Jul 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5a3e0d3
Cleanup Trusty refrences to Bionic
CryptoCentric Jun 25, 2019
6436c7e
Wallet Version image changes
CryptoCentric Jun 25, 2019
75e07c4
Ccache tar changes and permission cleanup
CryptoCentric Jun 26, 2019
1e2ddb8
Update build script for Gitian
CryptoCentric Jun 26, 2019
49c6b14
Bump Ccache Version and Location
CryptoCentric Jun 27, 2019
b8e774f
Add CCache Checksum hash
CryptoCentric Jun 27, 2019
39d53d9
Merge pull request #18 from absolute-community/v12.3.1a
CryptoCentric Jun 27, 2019
4c0ac3e
Configure Fix thread_local detection
CryptoCentric Jun 27, 2019
abb43a1
Merge branch 'v12.3.1' of https://github.com/absolute-community/Absol…
CryptoCentric Jun 27, 2019
eb11ae7
Fix Link References to Signatures
CryptoCentric Jun 29, 2019
5957a38
Enable local threads regardless of glibc_compat
CryptoCentric Jun 29, 2019
626bd7e
remove compatibility checks on glibc
CryptoCentric Jun 29, 2019
07141dc
Omit i686 builds under Linux
CryptoCentric Jun 30, 2019
25c9ae0
Depends Add riscv qt depends support for cross compiling bitcoin-qt
ken2812221 Jul 19, 2018
1107247
Build Add risc-v support
ken2812221 Jul 14, 2018
8436b88
Build Upgrade Qt depends to 5.9.6
TheCharlatan Jun 2, 2018
d4ec478
Depends Fix QT mac build
CryptoCentric Jul 2, 2019
11e21f5
Depends Qt 5.9.6
CryptoCentric Jul 2, 2019
4717b8c
Add fix_riscv64_arch.patch to Qt packages
CryptoCentric Jul 2, 2019
482d28c
Remove no-alsa from package list
CryptoCentric Jul 2, 2019
8bc362c
Fix Qt's rcc determinism for depends/gitian
Fuzzbawls Jul 21, 2018
57ba81a
Depends Add riscv qt depends support for cross compiling bitcoin-qt
ken2812221 Jul 19, 2018
b230b1c
Add depends 32-bit arm support for bitcoin-qt
TheCharlatan Jul 11, 2018
29a22ed
Qt 5.9.6 package updates
CryptoCentric Jul 2, 2019
0962b16
Ugrade, Set Compat on Qt depends
TheCharlatan May 19, 2018
9dd0520
Add RISC-V support
laanwj Jun 27, 2018
b58302f
depends: qt: avoid system harfbuzz and bz2
theuni Oct 3, 2018
4ad9869
depends: fix bitcoin-qt back-compat with older freetype versions at r…
theuni Sep 28, 2018
9c2623e
Merge branch 'v12.3.1b' of https://github.com/absolute-community/abso…
CryptoCentric Jul 3, 2019
aeccf1d
Build add missing leveldb defines
theuni Jul 13, 2018
c4d3e67
Remove Qt4 support
laanwj Jun 13, 2018
d280c9e
Build setup add net-tools
CryptoCentric Jul 3, 2019
8313cbf
Depends Remove old Qt patches
CryptoCentric Jul 5, 2019
2b4b01f
Build orthogonalize string quoting
lemzwerg Aug 22, 2017
029bdb4
Build Bump to Qt 5.9.7
fanquake Nov 29, 2018
d4fd950
depends: disable unused qt features
fanquake Nov 29, 2018
1fbb22f
Make build_depends.sh executable
CryptoCentric Jul 9, 2019
5433042
Make build_src.sh executable
CryptoCentric Jul 9, 2019
aac27e4
Update Build src fror ABS
CryptoCentric Jul 9, 2019
1f5f0c6
Repoint absolute_hash
CryptoCentric Jul 9, 2019
bed6e6c
Further Docker repoints
CryptoCentric Jul 9, 2019
4807b59
Make test_integrationtests.sh executable
CryptoCentric Jul 9, 2019
875f5ab
Travis update build timings
CryptoCentric Jul 9, 2019
5fd14c1
Make test_unittests.sh executable
CryptoCentric Jul 9, 2019
3c7511c
Make build-docker.sh executable
CryptoCentric Jul 9, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# IPv6 support

sudo: required
dist: trusty
dist: bionic

os: linux
language: generic
Expand Down Expand Up @@ -68,11 +68,11 @@ script:
- export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
# Our scripts try to be Travis agnostic
- $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh;
# Skip Absolute Core build if depends build take more than 20 mins.
- if [ $SECONDS -lt 1200 ]; then $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh && export SRC_BUILT="true"; fi
# Skip Absolute Core build if depends build take more than 30 mins.
- if [ $SECONDS -lt 1800 ]; then $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh && export SRC_BUILT="true"; fi
- |
if [ "$SRC_BUILT" = "true" ]; then
travis_wait 30 $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh;
travis_wait 40 $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh;
$DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh;
if [ "$DOCKER_BUILD" = "true" ]; then BUILD_DIR=build-ci/absolutecore-$BUILD_TARGET ./docker/build-docker.sh; fi;
else
Expand Down
321 changes: 153 additions & 168 deletions build-aux/m4/bitcoin_qt.m4

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ci/Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ RUN apt-get update && apt-get install -y \
# Python stuff
RUN pip3 install pyzmq # really needed?

# dash_hash
RUN git clone https://github.com/dashpay/dash_hash
RUN cd dash_hash && python3 setup.py install
# absolute_hash
RUN git clone https://github.com/absolute-community/absolute_hash
RUN cd absolute_hash && python3 setup.py install

ARG USER_ID=1000
ARG GROUP_ID=1000
Expand Down
Empty file modified ci/build_depends.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion ci/build_src.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cd build-ci
../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
make distdir VERSION=$BUILD_TARGET

cd dashcore-$BUILD_TARGET
cd absolutecore-$BUILD_TARGET
./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)

make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
2 changes: 1 addition & 1 deletion ci/test_integrationtests.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ fi

export LD_LIBRARY_PATH=$BUILD_DIR/depends/$HOST/lib

cd build-ci/dashcore-$BUILD_TARGET
cd build-ci/absolutecore-$BUILD_TARGET

./qa/pull-tester/rpc-tests.py --coverage
4 changes: 2 additions & 2 deletions ci/test_unittests.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ export LD_LIBRARY_PATH=$BUILD_DIR/depends/$HOST/lib
export WINEDEBUG=fixme-all
export BOOST_TEST_LOG_LEVEL=test_suite

cd build-ci/dashcore-$BUILD_TARGET
cd build-ci/absolutecore-$BUILD_TARGET
if [ "$DIRECT_WINE_EXEC_TESTS" = "true" ]; then
# Inside Docker, binfmt isn't working so we can't trust in make invoking windows binaries correctly
wine ./src/test/test_dash.exe
wine ./src/test/test_absolute.exe
else
make $MAKEJOBS check VERBOSE=1
fi
83 changes: 72 additions & 11 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@ AC_ARG_ENABLE([glibc-back-compat],
[use_glibc_compat=$enableval],
[use_glibc_compat=no])

AC_ARG_ENABLE([threadlocal],
[AS_HELP_STRING([--enable-threadlocal],
[enable features that depend on the c++ thread_local keyword (currently just thread names in debug logs). (default is to enabled if there is platform support and glibc-back-compat is not enabled)])],
[use_thread_local=$enableval],
[use_thread_local=auto])

AC_ARG_WITH([system-univalue],
[AS_HELP_STRING([--with-system-univalue],
[Build with system UniValue (default is no)])],
Expand Down Expand Up @@ -385,20 +391,37 @@ case $host in
CPPFLAGS="$CPPFLAGS -DMAC_OSX"
OBJCXXFLAGS="$CXXFLAGS"
;;
*android*)
dnl make sure android stays above linux for hosts like *linux-android*
LEVELDB_TARGET_FLAGS="-DOS_ANDROID"
;;
*linux*)
TARGET_OS=linux
LEVELDB_TARGET_FLAGS="-DOS_LINUX"
;;
*kfreebsd*)
LEVELDB_TARGET_FLAGS="-DOS_KFREEBSD"
;;
*freebsd*)
LEVELDB_TARGET_FLAGS="-DOS_FREEBSD"
;;
*openbsd*)
LEVELDB_TARGET_FLAGS="-DOS_OPENBSD"
;;
*netbsd*)
LEVELDB_TARGET_FLAGS="-DOS_NETBSD"
;;
*dragonfly*)
LEVELDB_TARGET_FLAGS="-DOS_DRAGONFLYBSD"
;;
*solaris*)
LEVELDB_TARGET_FLAGS="-DOS_SOLARIS"
;;
*hpux*)
LEVELDB_TARGET_FLAGS="-DOS_HPUX"
;;
*)
OTHER_OS=`echo ${host_os} | awk '{print toupper($0)}'`
AC_MSG_WARN([Guessing LevelDB OS as OS_${OTHER_OS}, please check whether this is correct, if not add an entry to configure.ac.])
LEVELDB_TARGET_FLAGS="-DOS_${OTHER_OS}"
AC_MSG_ERROR(Cannot build leveldb for $host. Please file a bug report.)
;;
esac

Expand Down Expand Up @@ -580,9 +603,48 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
]
)

if test x$use_reduce_exports = xyes; then
AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[RE_CXXFLAGS="-fvisibility=hidden"],
[AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])])
if test "x$use_thread_local" = xyes || { test "x$use_thread_local" = xauto && test "x$use_glibc_compat" = xno; }; then
TEMP_LDFLAGS="$LDFLAGS"
LDFLAGS="$TEMP_LDFLAGS $PTHREAD_CFLAGS"
AC_MSG_CHECKING([for thread_local support])
AC_LINK_IFELSE([AC_LANG_SOURCE([
#include <thread>
static thread_local int foo = 0;
static void run_thread() { foo++;}
int main(){
for(int i = 0; i < 10; i++) { std::thread(run_thread).detach();}
return foo;
}
])],
[
case $host in
*mingw*)
# mingw32's implementation of thread_local has also been shown to behave
# erroneously under concurrent usage; see:
# https://gist.github.com/jamesob/fe9a872051a88b2025b1aa37bfa98605
AC_MSG_RESULT(no)
;;
*darwin*)
# TODO enable thread_local on later versions of Darwin where it is
# supported (per https://stackoverflow.com/a/29929949)
AC_MSG_RESULT(no)
;;
*freebsd*)
# FreeBSD's implementation of thread_local is also buggy (per
# https://groups.google.com/d/msg/bsdmailinglist/22ncTZAbDp4/Dii_pII5AwAJ)
AC_MSG_RESULT(no)
;;
*)
AC_DEFINE(HAVE_THREAD_LOCAL,1,[Define if thread_local is supported.])
AC_MSG_RESULT(yes)
;;
esac
],
[
AC_MSG_RESULT(no)
]
)
LDFLAGS="$TEMP_LDFLAGS"
fi

LEVELDB_CPPFLAGS=
Expand Down Expand Up @@ -610,7 +672,7 @@ fi
BITCOIN_QT_INIT

dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5])
BITCOIN_QT_CONFIGURE([$use_pkgconfig])

if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then
use_boost=no
Expand Down Expand Up @@ -1162,12 +1224,11 @@ case ${OS} in
;;
esac

echo
echo
echo "Options used to compile and link:"
echo " with wallet = $enable_wallet"
echo " with gui / qt = $bitcoin_enable_qt"
if test x$bitcoin_enable_qt != xno; then
echo " qt version = $bitcoin_qt_got_major_vers"
echo " with qr = $use_qr"
fi
echo " with zmq = $use_zmq"
Expand All @@ -1176,7 +1237,7 @@ echo " with bench = $use_bench"
echo " with upnp = $use_upnp"
echo " debug enabled = $enable_debug"
echo " werror = $enable_werror"
echo
echo
echo " target os = $TARGET_OS"
echo " build os = $BUILD_OS"
echo
Expand All @@ -1186,4 +1247,4 @@ echo " CPPFLAGS = $CPPFLAGS"
echo " CXX = $CXX"
echo " CXXFLAGS = $CXXFLAGS"
echo " LDFLAGS = $LDFLAGS"
echo
echo
66 changes: 33 additions & 33 deletions contrib/gitian-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ def setup():
exit(1)
subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs)
if not os.path.isdir('gitian.sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/dashpay/gitian.sigs.git'])
if not os.path.isdir('dash-detached-sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/dashpay/dash-detached-sigs.git'])
subprocess.check_call(['git', 'clone', 'https://github.com/absolute-community/gitian.signatures.git'])
if not os.path.isdir('absolute-detached-sigs'):
subprocess.check_call(['git', 'clone', 'https://github.com/absolute-community/absolute.detached.signatures'])
if not os.path.isdir('gitian-builder'):
subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
if not os.path.isdir('dash'):
subprocess.check_call(['git', 'clone', 'https://github.com/dashpay/dash.git'])
if not os.path.isdir('absolute'):
subprocess.check_call(['git', 'clone', 'https://github.com/absolute-community/absolute.git'])
os.chdir('gitian-builder')
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
if args.docker:
Expand All @@ -46,7 +46,7 @@ def setup():
def build():
global args, workdir

os.makedirs('dashcore-binaries/' + args.version, exist_ok=True)
os.makedirs('absolutecore-binaries/' + args.version, exist_ok=True)
print('\nBuilding Dependencies\n')
os.chdir('gitian-builder')
os.makedirs('inputs', exist_ok=True)
Expand All @@ -55,29 +55,29 @@ def build():
subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://bitcoincore.org/cfields/osslsigncode-Backports-to-1.7.1.patch'])
subprocess.check_output(["echo 'a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 inputs/osslsigncode-Backports-to-1.7.1.patch' | sha256sum -c"], shell=True)
subprocess.check_output(["echo 'f9a8cdb38b9c309326764ebc937cba1523a3a751a7ab05df3ecc99d18ae466c9 inputs/osslsigncode-1.7.1.tar.gz' | sha256sum -c"], shell=True)
subprocess.check_call(['make', '-C', '../dash/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])
subprocess.check_call(['make', '-C', '../absolute/depends', 'download', 'SOURCES_PATH=' + os.getcwd() + '/cache/common'])

if args.linux:
print('\nCompiling ' + args.version + ' Linux')
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'dash='+args.commit, '--url', 'dash='+args.url, '../dash/contrib/gitian-descriptors/gitian-linux.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-linux.yml'])
subprocess.check_call('mv build/out/dashcore-*.tar.gz build/out/src/dashcore-*.tar.gz ../dashcore-binaries/'+args.version, shell=True)
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'absolute='+args.commit, '--url', 'absolute='+args.url, '../absolute/contrib/gitian-descriptors/gitian-linux.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-linux', '--destination', '../gitian.sigs/', '../absolute/contrib/gitian-descriptors/gitian-linux.yml'])
subprocess.check_call('mv build/out/absolutecore-*.tar.gz build/out/src/absolutecore-*.tar.gz ../absolutecore-binaries/'+args.version, shell=True)

if args.windows:
print('\nCompiling ' + args.version + ' Windows')
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'dash='+args.commit, '--url', 'dash='+args.url, '../dash/contrib/gitian-descriptors/gitian-win.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-unsigned', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-win.yml'])
subprocess.check_call('mv build/out/dashcore-*-win-unsigned.tar.gz inputs/dashcore-win-unsigned.tar.gz', shell=True)
subprocess.check_call('mv build/out/dashcore-*.zip build/out/dashcore-*.exe ../dashcore-binaries/'+args.version, shell=True)
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'absolute='+args.commit, '--url', 'absolute='+args.url, '../absolute/contrib/gitian-descriptors/gitian-win.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-unsigned', '--destination', '../gitian.sigs/', '../absolute/contrib/gitian-descriptors/gitian-win.yml'])
subprocess.check_call('mv build/out/absolutecore-*-win-unsigned.tar.gz inputs/absolutecore-win-unsigned.tar.gz', shell=True)
subprocess.check_call('mv build/out/absolutecore-*.zip build/out/absolutecore-*.exe ../absolutecore-binaries/'+args.version, shell=True)

if args.macos:
print('\nCompiling ' + args.version + ' MacOS')
subprocess.check_call(['wget', '-N', '-P', 'inputs', 'https://bitcoincore.org/depends-sources/sdks/MacOSX10.11.sdk.tar.gz'])
subprocess.check_output(["echo 'bec9d089ebf2e2dd59b1a811a38ec78ebd5da18cbbcd6ab39d1e59f64ac5033f inputs/MacOSX10.11.sdk.tar.gz' | sha256sum -c"], shell=True)
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'dash='+args.commit, '--url', 'dash='+args.url, '../dash/contrib/gitian-descriptors/gitian-osx.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-unsigned', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-osx.yml'])
subprocess.check_call('mv build/out/dashcore-*-osx-unsigned.tar.gz inputs/dashcore-osx-unsigned.tar.gz', shell=True)
subprocess.check_call('mv build/out/dashcore-*.tar.gz build/out/dashcore-*.dmg ../dashcore-binaries/'+args.version, shell=True)
subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'absolute='+args.commit, '--url', 'absolute='+args.url, '../absolute/contrib/gitian-descriptors/gitian-osx.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-unsigned', '--destination', '../gitian.sigs/', '../absolute/contrib/gitian-descriptors/gitian-osx.yml'])
subprocess.check_call('mv build/out/absolutecore-*-osx-unsigned.tar.gz inputs/absolutecore-osx-unsigned.tar.gz', shell=True)
subprocess.check_call('mv build/out/absolutecore-*.tar.gz build/out/absolutecore-*.dmg ../absolutecore-binaries/'+args.version, shell=True)

os.chdir(workdir)

Expand All @@ -96,16 +96,16 @@ def sign():

if args.windows:
print('\nSigning ' + args.version + ' Windows')
subprocess.check_call(['bin/gbuild', '-i', '--commit', 'signature='+args.commit, '../dash/contrib/gitian-descriptors/gitian-win-signer.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-signed', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-win-signer.yml'])
subprocess.check_call('mv build/out/dashcore-*win64-setup.exe ../dashcore-binaries/'+args.version, shell=True)
subprocess.check_call('mv build/out/dashcore-*win32-setup.exe ../dashcore-binaries/'+args.version, shell=True)
subprocess.check_call(['bin/gbuild', '-i', '--commit', 'signature='+args.commit, '../absolute/contrib/gitian-descriptors/gitian-win-signer.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-signed', '--destination', '../gitian.sigs/', '../absolute/contrib/gitian-descriptors/gitian-win-signer.yml'])
subprocess.check_call('mv build/out/absolutecore-*win64-setup.exe ../absolutecore-binaries/'+args.version, shell=True)
subprocess.check_call('mv build/out/absolutecore-*win32-setup.exe ../absolutecore-binaries/'+args.version, shell=True)

if args.macos:
print('\nSigning ' + args.version + ' MacOS')
subprocess.check_call(['bin/gbuild', '-i', '--commit', 'signature='+args.commit, '../dash/contrib/gitian-descriptors/gitian-osx-signer.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-signed', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-osx-signer.yml'])
subprocess.check_call('mv build/out/dashcore-osx-signed.dmg ../dashcore-binaries/'+args.version+'/dashcore-'+args.version+'-osx.dmg', shell=True)
subprocess.check_call(['bin/gbuild', '-i', '--commit', 'signature='+args.commit, '../absolute/contrib/gitian-descriptors/gitian-osx-signer.yml'])
subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx-signed', '--destination', '../gitian.sigs/', '../absolute/contrib/gitian-descriptors/gitian-osx-signer.yml'])
subprocess.check_call('mv build/out/absolutecore-osx-signed.dmg ../absolutecore-binaries/'+args.version+'/absolutecore-'+args.version+'-osx.dmg', shell=True)

os.chdir(workdir)

Expand All @@ -122,15 +122,15 @@ def verify():
os.chdir('gitian-builder')

print('\nVerifying v'+args.version+' Linux\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../dash/contrib/gitian-descriptors/gitian-linux.yml'])
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-linux', '../absolute/contrib/gitian-descriptors/gitian-linux.yml'])
print('\nVerifying v'+args.version+' Windows\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-unsigned', '../dash/contrib/gitian-descriptors/gitian-win.yml'])
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-unsigned', '../absolute/contrib/gitian-descriptors/gitian-win.yml'])
print('\nVerifying v'+args.version+' MacOS\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-unsigned', '../dash/contrib/gitian-descriptors/gitian-osx.yml'])
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-unsigned', '../absolute/contrib/gitian-descriptors/gitian-osx.yml'])
print('\nVerifying v'+args.version+' Signed Windows\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-signed', '../dash/contrib/gitian-descriptors/gitian-win-signer.yml'])
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-win-signed', '../absolute/contrib/gitian-descriptors/gitian-win-signer.yml'])
print('\nVerifying v'+args.version+' Signed MacOS\n')
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-signed', '../dash/contrib/gitian-descriptors/gitian-osx-signer.yml'])
subprocess.call(['bin/gverify', '-v', '-d', '../gitian.sigs/', '-r', args.version+'-osx-signed', '../absolute/contrib/gitian-descriptors/gitian-osx-signer.yml'])

os.chdir(workdir)

Expand All @@ -140,7 +140,7 @@ def main():
parser = argparse.ArgumentParser(usage='%(prog)s [options] signer version')
parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch')
parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request')
parser.add_argument('-u', '--url', dest='url', default='https://github.com/dashpay/dash', help='Specify the URL of the repository. Default is %(default)s')
parser.add_argument('-u', '--url', dest='url', default='https://github.com/absolute-community/absolute', help='Specify the URL of the repository. Default is %(default)s')
parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build')
parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build')
parser.add_argument('-s', '--sign', action='store_true', dest='sign', help='Make signed binaries for Windows and MacOS')
Expand Down Expand Up @@ -216,10 +216,10 @@ def main():
if not args.build and not args.sign and not args.verify:
exit(0)

os.chdir('dash')
os.chdir('absolute')
if args.pull:
subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge'])
os.chdir('../gitian-builder/inputs/dash')
os.chdir('../gitian-builder/inputs/absolute')
subprocess.check_call(['git', 'fetch', args.url, 'refs/pull/'+args.version+'/merge'])
args.commit = subprocess.check_output(['git', 'show', '-s', '--format=%H', 'FETCH_HEAD'], universal_newlines=True, encoding='utf8').strip()
args.version = 'pull-' + args.version
Expand Down
Loading