Skip to content

Commit

Permalink
multichaind-cold first version
Browse files Browse the repository at this point in the history
  • Loading branch information
mike31 committed Sep 5, 2017
1 parent 42bf5e9 commit 31082bb
Show file tree
Hide file tree
Showing 8 changed files with 1,516 additions and 254 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ src/bitcoin-tx
src/multichain-cli
src/multichain-util
src/multichaind
src/multichaind-cold
src/test/test_bitcoin
src/qt/test/test_bitcoin-qt

Expand Down
5 changes: 5 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX
# MCHN START

MULTICHAIND_BIN=$(top_builddir)/src/multichaind$(EXEEXT)
MULTICHAIND_COLD_BIN=$(top_builddir)/src/multichaind-cold$(EXEEXT)
MULTICHAIN_CLI_BIN=$(top_builddir)/src/multichain-cli$(EXEEXT)
MULTICHAIN_UTIL_BIN=$(top_builddir)/src/multichain-util$(EXEEXT)

Expand Down Expand Up @@ -62,6 +63,7 @@ $(BITCOIN_WIN_INSTALLER): all-recursive
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(MULTICHAIND_BIN) $(top_builddir)/release # MCHN
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(MULTICHAIND_COLD_BIN) $(top_builddir)/release # MCHN
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(MULTICHAI_CLI_BIN) $(top_builddir)/release # MCHN
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(MULTICHAI_UTIL_BIN) $(top_builddir)/release # MCHN
@test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
Expand Down Expand Up @@ -146,6 +148,9 @@ $(BITCOIN_CLI_BIN): FORCE
$(MULTICHAIND_BIN): FORCE
$(MAKE) -C src $(@F)

$(MULTICHAIND_COLD_BIN): FORCE
$(MAKE) -C src $(@F)

$(MULTICHAIN_CLI_BIN): FORCE
$(MAKE) -C src $(@F)

Expand Down
31 changes: 29 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ TESTS =

if BUILD_BITCOIND
# bin_PROGRAMS += bitcoind multichaind # MCHN
bin_PROGRAMS += multichaind # MCHN
bin_PROGRAMS += multichaind multichaind-cold # MCHN
endif

if BUILD_BITCOIN_UTILS
Expand Down Expand Up @@ -409,7 +409,7 @@ multichaind_LDADD = \
#if ENABLE_WALLET
#multichaind_LDADD += libbitcoin_wallet.a
#endif
multichaind_SOURCES = multichain/multichaind.cpp chainparams/buildgenesis.cpp
multichaind_SOURCES = multichain/multichaind.cpp rpc/rpclist.cpp chainparams/buildgenesis.cpp
#

if TARGET_WINDOWS
Expand All @@ -420,6 +420,33 @@ multichaind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINI
multichaind_CPPFLAGS = $(BITCOIN_INCLUDES)
multichaind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

# multichaind-cold binary #
multichaind_cold_LDADD = \
$(LIBBITCOIN_SERVER) \
$(LIBBITCOIN_COMMON) \
$(LIBBITCOIN_UNIVALUE) \
$(LIBBITCOIN_WALLET) \
$(LIBBITCOIN_MULTICHAIN) \
$(LIBBITCOIN_UTIL) \
$(LIBBITCOIN_CRYPTO) \
$(LIBLEVELDB) \
$(LIBMEMENV) \
$(LIBSECP256K1)

#if ENABLE_WALLET
#multichaind_cold_LDADD += libbitcoin_wallet.a
#endif
multichaind_cold_SOURCES = multichain/multichaind-cold.cpp core/init-cold.cpp rpc/rpclist-cold.cpp chainparams/buildgenesis.cpp
#

if TARGET_WINDOWS
multichaind_cold_SOURCES += multichaind-cold-res.rc
endif

multichaind_cold_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
multichaind_cold_CPPFLAGS = $(BITCOIN_INCLUDES)
multichaind_cold_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)

# multichain-cli binary #
multichain_cli_LDADD = \
$(LIBBITCOIN_CLI) \
Expand Down
Loading

0 comments on commit 31082bb

Please sign in to comment.