Skip to content

Commit

Permalink
various (gitian) build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
UdjinM6 committed Apr 29, 2015
1 parent 854a1be commit 24309f7
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 643 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ check-local:
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
endif

EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-dash-cli qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)

CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)

Expand Down
8 changes: 5 additions & 3 deletions contrib/dash-qt.pro
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
######################################################################
# Automatically generated by qmake (2.01a) ?? ??? 5 03:11:45 2015
# Automatically generated by qmake (2.01a) ?? ??? 17 02:23:35 2015
######################################################################

TEMPLATE = app
Expand Down Expand Up @@ -39,8 +39,8 @@ INCLUDEPATH += . \
src/crypto \
src/primitives \
src/script \
src/univalue \
src/obj \
src/univalue \
src/json \
src/compat \
src/secp256k1/include \
Expand Down Expand Up @@ -88,6 +88,7 @@ HEADERS += src/activemasternode.h \
src/leveldbwrapper.h \
src/limitedmap.h \
src/main.h \
src/masternode-payments.h \
src/masternode-pos.h \
src/masternode.h \
src/masternodeconfig.h \
Expand Down Expand Up @@ -383,6 +384,7 @@ SOURCES += src/activemasternode.cpp \
src/keystore.cpp \
src/leveldbwrapper.cpp \
src/main.cpp \
src/masternode-payments.cpp \
src/masternode-pos.cpp \
src/masternode.cpp \
src/masternodeconfig.cpp \
Expand Down Expand Up @@ -477,7 +479,6 @@ SOURCES += src/activemasternode.cpp \
src/qt/paymentrequestplus.cpp \
src/qt/paymentserver.cpp \
src/qt/peertablemodel.cpp \
src/qt/qrc_darkcoin.cpp \
src/qt/qvalidatedlineedit.cpp \
src/qt/qvaluecombobox.cpp \
src/qt/receivecoinsdialog.cpp \
Expand Down Expand Up @@ -526,6 +527,7 @@ SOURCES += src/activemasternode.cpp \
src/test/hash_tests.cpp \
src/test/key_tests.cpp \
src/test/main_tests.cpp \
src/test/mempool_tests.cpp \
src/test/miner_tests.cpp \
src/test/mruset_tests.cpp \
src/test/multisig_tests.cpp \
Expand Down
4 changes: 2 additions & 2 deletions contrib/gitian-descriptors/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Sanity checks:

Once you've got the right hardware and software:

git clone git://github.com/darkcoin/darkcoin.git
git clone git://github.com/dashpay/dash.git
git clone git://github.com/devrandom/gitian-builder.git
mkdir gitian-builder/inputs
cd gitian-builder/inputs
Expand Down Expand Up @@ -62,5 +62,5 @@ Here's a description of Gavin's setup on OSX 10.6:
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/darkcoin/darkcoin.git
git clone git://github.com/dashpay/dash.git
... etc
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "dash-linux-0.10"
name: "dash-linux-0.12"
enable_cache: true
suites:
- "precise"
Expand Down
60 changes: 0 additions & 60 deletions contrib/gitian-descriptors/gitian-osx-dash.yml

This file was deleted.

159 changes: 0 additions & 159 deletions contrib/gitian-descriptors/gitian-osx-depends.yml

This file was deleted.

Loading

0 comments on commit 24309f7

Please sign in to comment.