Change binaries to darkcoin*.
This commit is contained in:
parent
828b6d38a1
commit
e449d7b4e7
18
Makefile.am
18
Makefile.am
@ -4,13 +4,13 @@ SUBDIRS = src
|
|||||||
|
|
||||||
GZIP_ENV="-9n"
|
GZIP_ENV="-9n"
|
||||||
|
|
||||||
BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
|
BITCOIND_BIN=$(top_builddir)/src/darkcoind$(EXEEXT)
|
||||||
BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
|
BITCOIN_QT_BIN=$(top_builddir)/src/qt/darkcoin-qt$(EXEEXT)
|
||||||
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
|
BITCOIN_CLI_BIN=$(top_builddir)/src/darkcoin-cli$(EXEEXT)
|
||||||
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
|
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
|
||||||
|
|
||||||
OSX_APP=Bitcoin-Qt.app
|
OSX_APP=Darkcoin-Qt.app
|
||||||
OSX_DMG=Bitcoin-Qt.dmg
|
OSX_DMG=Darkcoin-Qt.dmg
|
||||||
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
|
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
|
||||||
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
|
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
|
||||||
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
|
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
|
||||||
@ -72,13 +72,13 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
|
|||||||
$(MKDIR_P) $(@D)
|
$(MKDIR_P) $(@D)
|
||||||
$(INSTALL_DATA) $< $@
|
$(INSTALL_DATA) $< $@
|
||||||
|
|
||||||
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
|
$(OSX_APP)/Contents/MacOS/Darkcoin-Qt: $(BITCOIN_QT_BIN)
|
||||||
$(MKDIR_P) $(@D)
|
$(MKDIR_P) $(@D)
|
||||||
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
|
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@
|
||||||
|
|
||||||
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
|
OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
|
||||||
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
|
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
|
||||||
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
|
$(OSX_APP)/Contents/MacOS/Darkcoin-Qt
|
||||||
|
|
||||||
if BUILD_DARWIN
|
if BUILD_DARWIN
|
||||||
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
|
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
|
||||||
@ -91,7 +91,7 @@ $(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
|
|||||||
$(INSTALL) contrib/macdeploy/background.png dist/.background
|
$(INSTALL) contrib/macdeploy/background.png dist/.background
|
||||||
$(INSTALL) contrib/macdeploy/DS_Store dist/.DS_Store
|
$(INSTALL) contrib/macdeploy/DS_Store dist/.DS_Store
|
||||||
cd dist; $(LN_S) /Applications Applications
|
cd dist; $(LN_S) /Applications Applications
|
||||||
$(GENISOIMAGE) -no-cache-inodes -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist
|
$(GENISOIMAGE) -no-cache-inodes -l -probe -V "Darkcoin-Qt" -no-pad -r -apple -o $@ dist
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if TARGET_DARWIN
|
if TARGET_DARWIN
|
||||||
@ -121,7 +121,7 @@ baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtere
|
|||||||
|
|
||||||
test_bitcoin.info: baseline_filtered_combined.info
|
test_bitcoin.info: baseline_filtered_combined.info
|
||||||
$(MAKE) -C src/ check
|
$(MAKE) -C src/ check
|
||||||
$(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@
|
$(LCOV) -c -d $(abs_builddir)/src -t test_darkcoin -o $@
|
||||||
$(LCOV) -z -d $(abs_builddir)/src
|
$(LCOV) -z -d $(abs_builddir)/src
|
||||||
$(LCOV) -z -d $(abs_builddir)/src/leveldb
|
$(LCOV) -z -d $(abs_builddir)/src/leveldb
|
||||||
|
|
||||||
|
16
configure.ac
16
configure.ac
@ -1,12 +1,12 @@
|
|||||||
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
|
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
|
||||||
AC_PREREQ([2.60])
|
AC_PREREQ([2.60])
|
||||||
define(_CLIENT_VERSION_MAJOR, 0)
|
define(_CLIENT_VERSION_MAJOR, 0)
|
||||||
define(_CLIENT_VERSION_MINOR, 9)
|
define(_CLIENT_VERSION_MINOR, 11)
|
||||||
define(_CLIENT_VERSION_REVISION, 3)
|
define(_CLIENT_VERSION_REVISION, 0)
|
||||||
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, 2015)
|
||||||
AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin])
|
AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin])
|
||||||
AC_CONFIG_AUX_DIR([src/build-aux])
|
AC_CONFIG_AUX_DIR([src/build-aux])
|
||||||
AC_CONFIG_MACRO_DIR([src/m4])
|
AC_CONFIG_MACRO_DIR([src/m4])
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
@ -563,11 +563,11 @@ fi
|
|||||||
|
|
||||||
BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
|
BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build bitcoind])
|
AC_MSG_CHECKING([whether to build darkcoind])
|
||||||
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
|
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
|
||||||
AC_MSG_RESULT($build_bitcoind)
|
AC_MSG_RESULT($build_bitcoind)
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build bitcoin-cli])
|
AC_MSG_CHECKING([whether to build darkcoin-cli])
|
||||||
AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
|
AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
|
||||||
AC_MSG_RESULT($build_bitcoin_cli)
|
AC_MSG_RESULT($build_bitcoin_cli)
|
||||||
|
|
||||||
@ -660,7 +660,7 @@ if test x$bitcoin_enable_qt != xno; then
|
|||||||
AC_MSG_WARN("xgettext is required to update qt translations")
|
AC_MSG_WARN("xgettext is required to update qt translations")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build test_bitcoin-qt])
|
AC_MSG_CHECKING([whether to build test_darkcoin-qt])
|
||||||
if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
|
if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
BUILD_TEST_QT="test"
|
BUILD_TEST_QT="test"
|
||||||
@ -669,7 +669,7 @@ if test x$bitcoin_enable_qt != xno; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build test_bitcoin])
|
AC_MSG_CHECKING([whether to build test_darkcoin])
|
||||||
if test x$use_tests = xyes; then
|
if test x$use_tests = xyes; then
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
BUILD_TEST="test"
|
BUILD_TEST="test"
|
||||||
|
@ -3,27 +3,27 @@ include Makefile.include
|
|||||||
AM_CPPFLAGS += -I$(builddir)
|
AM_CPPFLAGS += -I$(builddir)
|
||||||
|
|
||||||
noinst_LIBRARIES = \
|
noinst_LIBRARIES = \
|
||||||
libbitcoin_server.a \
|
libdarkcoin_server.a \
|
||||||
libbitcoin_common.a \
|
libdarkcoin_common.a \
|
||||||
libbitcoin_cli.a
|
libdarkcoin_cli.a
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
noinst_LIBRARIES += libbitcoin_wallet.a
|
noinst_LIBRARIES += libdarkcoin_wallet.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
bin_PROGRAMS =
|
bin_PROGRAMS =
|
||||||
|
|
||||||
if BUILD_BITCOIND
|
if BUILD_BITCOIND
|
||||||
bin_PROGRAMS += bitcoind
|
bin_PROGRAMS += darkcoind
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BUILD_BITCOIN_CLI
|
if BUILD_BITCOIN_CLI
|
||||||
bin_PROGRAMS += bitcoin-cli
|
bin_PROGRAMS += darkcoin-cli
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
|
SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
|
||||||
DIST_SUBDIRS = . qt test
|
DIST_SUBDIRS = . qt test
|
||||||
.PHONY: FORCE
|
.PHONY: FORCE
|
||||||
# bitcoin core #
|
# darkcoin core #
|
||||||
BITCOIN_CORE_H = \
|
BITCOIN_CORE_H = \
|
||||||
addrman.h \
|
addrman.h \
|
||||||
alert.h \
|
alert.h \
|
||||||
@ -99,7 +99,7 @@ obj/build.h: FORCE
|
|||||||
$(abs_top_srcdir)
|
$(abs_top_srcdir)
|
||||||
version.o: obj/build.h
|
version.o: obj/build.h
|
||||||
|
|
||||||
libbitcoin_server_a_SOURCES = \
|
libdarkcoin_server_a_SOURCES = \
|
||||||
addrman.cpp \
|
addrman.cpp \
|
||||||
alert.cpp \
|
alert.cpp \
|
||||||
bloom.cpp \
|
bloom.cpp \
|
||||||
@ -123,7 +123,7 @@ libbitcoin_server_a_SOURCES = \
|
|||||||
$(JSON_H) \
|
$(JSON_H) \
|
||||||
$(BITCOIN_CORE_H)
|
$(BITCOIN_CORE_H)
|
||||||
|
|
||||||
libbitcoin_wallet_a_SOURCES = \
|
libdarkcoin_wallet_a_SOURCES = \
|
||||||
db.cpp \
|
db.cpp \
|
||||||
crypter.cpp \
|
crypter.cpp \
|
||||||
rpcdump.cpp \
|
rpcdump.cpp \
|
||||||
@ -132,7 +132,7 @@ libbitcoin_wallet_a_SOURCES = \
|
|||||||
walletdb.cpp \
|
walletdb.cpp \
|
||||||
$(BITCOIN_CORE_H)
|
$(BITCOIN_CORE_H)
|
||||||
|
|
||||||
libbitcoin_common_a_SOURCES = \
|
libdarkcoin_common_a_SOURCES = \
|
||||||
base58.cpp \
|
base58.cpp \
|
||||||
allocators.cpp \
|
allocators.cpp \
|
||||||
chainparams.cpp \
|
chainparams.cpp \
|
||||||
@ -161,47 +161,47 @@ libbitcoin_common_a_SOURCES = \
|
|||||||
$(BITCOIN_CORE_H)
|
$(BITCOIN_CORE_H)
|
||||||
|
|
||||||
if GLIBC_BACK_COMPAT
|
if GLIBC_BACK_COMPAT
|
||||||
libbitcoin_common_a_SOURCES += compat/glibc_compat.cpp
|
libdarkcoin_common_a_SOURCES += compat/glibc_compat.cpp
|
||||||
libbitcoin_common_a_SOURCES += compat/glibcxx_compat.cpp
|
libdarkcoin_common_a_SOURCES += compat/glibcxx_compat.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libbitcoin_cli_a_SOURCES = \
|
libdarkcoin_cli_a_SOURCES = \
|
||||||
rpcclient.cpp \
|
rpcclient.cpp \
|
||||||
$(BITCOIN_CORE_H)
|
$(BITCOIN_CORE_H)
|
||||||
|
|
||||||
nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
|
nodist_libdarkcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
|
||||||
#
|
#
|
||||||
|
|
||||||
# bitcoind binary #
|
# darkcoind binary #
|
||||||
bitcoind_LDADD = \
|
darkcoind_LDADD = \
|
||||||
libbitcoin_server.a \
|
libdarkcoin_server.a \
|
||||||
libbitcoin_cli.a \
|
libdarkcoin_cli.a \
|
||||||
libbitcoin_common.a \
|
libdarkcoin_common.a \
|
||||||
$(LIBLEVELDB) \
|
$(LIBLEVELDB) \
|
||||||
$(LIBMEMENV)
|
$(LIBMEMENV)
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
bitcoind_LDADD += libbitcoin_wallet.a
|
darkcoind_LDADD += libdarkcoin_wallet.a
|
||||||
endif
|
endif
|
||||||
bitcoind_SOURCES = bitcoind.cpp
|
darkcoind_SOURCES = bitcoind.cpp
|
||||||
#
|
#
|
||||||
|
|
||||||
if TARGET_WINDOWS
|
if TARGET_WINDOWS
|
||||||
bitcoind_SOURCES += bitcoind-res.rc
|
darkcoind_SOURCES += bitcoind-res.rc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AM_CPPFLAGS += $(BDB_CPPFLAGS)
|
AM_CPPFLAGS += $(BDB_CPPFLAGS)
|
||||||
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
|
darkcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
|
||||||
|
|
||||||
# bitcoin-cli binary #
|
# darkcoin-cli binary #
|
||||||
bitcoin_cli_LDADD = \
|
darkcoin_cli_LDADD = \
|
||||||
libbitcoin_cli.a \
|
libdarkcoin_cli.a \
|
||||||
libbitcoin_common.a \
|
libdarkcoin_common.a \
|
||||||
$(BOOST_LIBS)
|
$(BOOST_LIBS)
|
||||||
bitcoin_cli_SOURCES = bitcoin-cli.cpp
|
darkcoin_cli_SOURCES = bitcoin-cli.cpp
|
||||||
#
|
#
|
||||||
|
|
||||||
if TARGET_WINDOWS
|
if TARGET_WINDOWS
|
||||||
bitcoin_cli_SOURCES += bitcoin-cli-res.rc
|
darkcoin_cli_SOURCES += bitcoin-cli-res.rc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
|
# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
|
||||||
@ -212,7 +212,7 @@ leveldb/%.a:
|
|||||||
CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
|
CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
|
||||||
OPT="$(CXXFLAGS) $(CPPFLAGS)"
|
OPT="$(CXXFLAGS) $(CPPFLAGS)"
|
||||||
|
|
||||||
qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_cli_a_SOURCES)
|
qt/bitcoinstrings.cpp: $(libdarkcoin_server_a_SOURCES) $(libdarkcoin_common_a_SOURCES) $(libdarkcoin_cli_a_SOURCES)
|
||||||
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
|
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
|
||||||
@cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py
|
@cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py
|
||||||
|
|
||||||
|
@ -12,11 +12,11 @@ AM_CPPFLAGS = $(INCLUDES) \
|
|||||||
AM_CPPFLAGS += $(LEVELDB_CPPFLAGS)
|
AM_CPPFLAGS += $(LEVELDB_CPPFLAGS)
|
||||||
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
AM_LDFLAGS = $(PTHREAD_CFLAGS)
|
||||||
|
|
||||||
LIBBITCOIN_SERVER=$(top_builddir)/src/libbitcoin_server.a
|
LIBBITCOIN_SERVER=$(top_builddir)/src/libdarkcoin_server.a
|
||||||
LIBBITCOIN_WALLET=$(top_builddir)/src/libbitcoin_wallet.a
|
LIBBITCOIN_WALLET=$(top_builddir)/src/libdarkcoin_wallet.a
|
||||||
LIBBITCOIN_COMMON=$(top_builddir)/src/libbitcoin_common.a
|
LIBBITCOIN_COMMON=$(top_builddir)/src/libdarkcoin_common.a
|
||||||
LIBBITCOIN_CLI=$(top_builddir)/src/libbitcoin_cli.a
|
LIBBITCOIN_CLI=$(top_builddir)/src/libdarkcoin_cli.a
|
||||||
LIBBITCOINQT=$(top_builddir)/src/qt/libbitcoinqt.a
|
LIBBITCOINQT=$(top_builddir)/src/qt/libdarkcoinqt.a
|
||||||
|
|
||||||
$(LIBBITCOIN):
|
$(LIBBITCOIN):
|
||||||
$(MAKE) -C $(top_builddir)/src $(@F)
|
$(MAKE) -C $(top_builddir)/src $(@F)
|
||||||
|
@ -3,7 +3,7 @@ dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
|
|||||||
AC_DEFUN([BITCOIN_QT_FAIL],[
|
AC_DEFUN([BITCOIN_QT_FAIL],[
|
||||||
if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then
|
if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then
|
||||||
if test x$bitcoin_enable_qt != xno; then
|
if test x$bitcoin_enable_qt != xno; then
|
||||||
AC_MSG_WARN([$1; bitcoin-qt frontend will not be built])
|
AC_MSG_WARN([$1; darkcoin-qt frontend will not be built])
|
||||||
fi
|
fi
|
||||||
bitcoin_enable_qt=no
|
bitcoin_enable_qt=no
|
||||||
else
|
else
|
||||||
@ -123,7 +123,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
|
|||||||
|
|
||||||
|
|
||||||
dnl enable qt support
|
dnl enable qt support
|
||||||
AC_MSG_CHECKING(whether to build Bitcoin Core GUI)
|
AC_MSG_CHECKING(whether to build Darkcoin Core GUI)
|
||||||
BITCOIN_QT_CHECK([
|
BITCOIN_QT_CHECK([
|
||||||
bitcoin_enable_qt=yes
|
bitcoin_enable_qt=yes
|
||||||
bitcoin_enable_qt_test=yes
|
bitcoin_enable_qt_test=yes
|
||||||
@ -343,14 +343,14 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
|
|||||||
dnl check a header to find out. When Qt is built statically, some plugins must
|
dnl check a header to find out. When Qt is built statically, some plugins must
|
||||||
dnl be linked into the final binary as well. These plugins have changed between
|
dnl be linked into the final binary as well. These plugins have changed between
|
||||||
dnl Qt4 and Qt5. With Qt5, languages moved into core and the WindowsIntegration
|
dnl Qt4 and Qt5. With Qt5, languages moved into core and the WindowsIntegration
|
||||||
dnl plugin was added. Since we can't tell if Qt4 is static or not, it is
|
dnl plugin was added. Since we can't tell if Qt4 is static or not, it is
|
||||||
dnl assumed for all non-pkg-config builds.
|
dnl assumed for all non-pkg-config builds.
|
||||||
dnl _BITCOIN_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the
|
dnl _BITCOIN_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the
|
||||||
dnl results to QT_LIBS.
|
dnl results to QT_LIBS.
|
||||||
BITCOIN_QT_CHECK([
|
BITCOIN_QT_CHECK([
|
||||||
if test x$bitcoin_qt_got_major_vers == x5; then
|
if test x$bitcoin_qt_got_major_vers == x5; then
|
||||||
_BITCOIN_QT_IS_STATIC
|
_BITCOIN_QT_IS_STATIC
|
||||||
if test x$bitcoin_cv_static_qt == xyes; then
|
if test x$bitcoin_cv_static_qt == xyes; then
|
||||||
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static])
|
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static])
|
||||||
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
|
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
|
||||||
if test x$TARGET_OS == xwindows; then
|
if test x$TARGET_OS == xwindows; then
|
||||||
|
@ -5,12 +5,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \
|
|||||||
-I$(top_builddir)/src/qt/forms \
|
-I$(top_builddir)/src/qt/forms \
|
||||||
$(PROTOBUF_CFLAGS) \
|
$(PROTOBUF_CFLAGS) \
|
||||||
$(QR_CFLAGS)
|
$(QR_CFLAGS)
|
||||||
bin_PROGRAMS = bitcoin-qt
|
bin_PROGRAMS = darkcoin-qt
|
||||||
noinst_LIBRARIES = libbitcoinqt.a
|
noinst_LIBRARIES = libdarkcoinqt.a
|
||||||
SUBDIRS = . $(BUILD_TEST_QT)
|
SUBDIRS = . $(BUILD_TEST_QT)
|
||||||
DIST_SUBDIRS = . test
|
DIST_SUBDIRS = . test
|
||||||
|
|
||||||
# bitcoin qt core #
|
# darkcoin qt core #
|
||||||
QT_TS = \
|
QT_TS = \
|
||||||
locale/bitcoin_ach.ts \
|
locale/bitcoin_ach.ts \
|
||||||
locale/bitcoin_af_ZA.ts \
|
locale/bitcoin_af_ZA.ts \
|
||||||
@ -321,38 +321,38 @@ RES_MOVIES = $(wildcard res/movies/spinner-*.png)
|
|||||||
|
|
||||||
BITCOIN_RC = res/bitcoin-qt-res.rc
|
BITCOIN_RC = res/bitcoin-qt-res.rc
|
||||||
|
|
||||||
libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
|
libdarkcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
|
||||||
-I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES)
|
-I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES)
|
||||||
libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
|
libdarkcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
|
||||||
$(QT_QRC) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)
|
$(QT_QRC) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)
|
||||||
|
|
||||||
nodist_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
|
nodist_libdarkcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
|
||||||
$(PROTOBUF_H) $(QT_QRC_CPP)
|
$(PROTOBUF_H) $(QT_QRC_CPP)
|
||||||
|
|
||||||
BUILT_SOURCES = $(nodist_libbitcoinqt_a_SOURCES)
|
BUILT_SOURCES = $(nodist_libdarkcoinqt_a_SOURCES)
|
||||||
|
|
||||||
#Generating these with a half-written protobuf header leads to wacky results.
|
#Generating these with a half-written protobuf header leads to wacky results.
|
||||||
#This makes sure it's done.
|
#This makes sure it's done.
|
||||||
$(QT_MOC): $(PROTOBUF_H)
|
$(QT_MOC): $(PROTOBUF_H)
|
||||||
$(QT_MOC_CPP): $(PROTOBUF_H)
|
$(QT_MOC_CPP): $(PROTOBUF_H)
|
||||||
|
|
||||||
# bitcoin-qt binary #
|
# darkcoin-qt binary #
|
||||||
bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
|
darkcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
|
||||||
-I$(top_srcdir)/src/qt/forms
|
-I$(top_srcdir)/src/qt/forms
|
||||||
bitcoin_qt_SOURCES = bitcoin.cpp
|
darkcoin_qt_SOURCES = bitcoin.cpp
|
||||||
if TARGET_DARWIN
|
if TARGET_DARWIN
|
||||||
bitcoin_qt_SOURCES += $(BITCOIN_MM)
|
darkcoin_qt_SOURCES += $(BITCOIN_MM)
|
||||||
endif
|
endif
|
||||||
if TARGET_WINDOWS
|
if TARGET_WINDOWS
|
||||||
bitcoin_qt_SOURCES += $(BITCOIN_RC)
|
darkcoin_qt_SOURCES += $(BITCOIN_RC)
|
||||||
endif
|
endif
|
||||||
bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
|
darkcoin_qt_LDADD = libdarkcoinqt.a $(LIBBITCOIN_SERVER)
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
darkcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||||
endif
|
endif
|
||||||
bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
|
darkcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||||
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
||||||
bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
darkcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
||||||
|
|
||||||
# forms/foo.h -> forms/ui_foo.h
|
# forms/foo.h -> forms/ui_foo.h
|
||||||
QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))
|
QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))
|
||||||
@ -371,7 +371,7 @@ translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(
|
|||||||
@QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/bitcoin_en.ts
|
@QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/bitcoin_en.ts
|
||||||
|
|
||||||
$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
|
$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
|
||||||
@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
|
@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name darkcoin -o $(abs_builddir)/$@ $< || \
|
||||||
echo error: could not build $@
|
echo error: could not build $@
|
||||||
$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
|
$(SED) -e '/^\*\*.*Created:/d' $@ > $@.n && mv $@{.n,}
|
||||||
$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
|
$(SED) -e '/^\*\*.*by:/d' $@ > $@.n && mv $@{.n,}
|
||||||
|
@ -5,8 +5,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \
|
|||||||
-I$(top_builddir)/src/qt \
|
-I$(top_builddir)/src/qt \
|
||||||
$(PROTOBUF_CFLAGS) \
|
$(PROTOBUF_CFLAGS) \
|
||||||
$(QR_CFLAGS)
|
$(QR_CFLAGS)
|
||||||
bin_PROGRAMS = test_bitcoin-qt
|
bin_PROGRAMS = test_darkcoin-qt
|
||||||
TESTS = test_bitcoin-qt
|
TESTS = test_darkcoin-qt
|
||||||
|
|
||||||
TEST_QT_MOC_CPP = moc_uritests.cpp
|
TEST_QT_MOC_CPP = moc_uritests.cpp
|
||||||
|
|
||||||
@ -21,26 +21,26 @@ TEST_QT_H = \
|
|||||||
|
|
||||||
BUILT_SOURCES = $(TEST_QT_MOC_CPP)
|
BUILT_SOURCES = $(TEST_QT_MOC_CPP)
|
||||||
|
|
||||||
test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
|
test_darkcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
|
||||||
|
|
||||||
test_bitcoin_qt_SOURCES = \
|
test_darkcoin_qt_SOURCES = \
|
||||||
test_main.cpp \
|
test_main.cpp \
|
||||||
uritests.cpp \
|
uritests.cpp \
|
||||||
$(TEST_QT_H)
|
$(TEST_QT_H)
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
test_bitcoin_qt_SOURCES += \
|
test_darkcoin_qt_SOURCES += \
|
||||||
paymentservertests.cpp
|
paymentservertests.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
|
nodist_test_darkcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
|
||||||
|
|
||||||
test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
|
test_darkcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
test_darkcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||||
endif
|
endif
|
||||||
test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
|
test_darkcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
|
||||||
$(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
|
$(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
|
||||||
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
||||||
test_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
test_darkcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
||||||
|
|
||||||
CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno
|
CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno
|
||||||
|
@ -2,9 +2,9 @@ include $(top_srcdir)/src/Makefile.include
|
|||||||
|
|
||||||
AM_CPPFLAGS += -I$(top_srcdir)/src
|
AM_CPPFLAGS += -I$(top_srcdir)/src
|
||||||
|
|
||||||
bin_PROGRAMS = test_bitcoin
|
bin_PROGRAMS = test_darkcoin
|
||||||
|
|
||||||
TESTS = test_bitcoin
|
TESTS = test_darkcoin
|
||||||
|
|
||||||
JSON_TEST_FILES = \
|
JSON_TEST_FILES = \
|
||||||
data/script_valid.json \
|
data/script_valid.json \
|
||||||
@ -22,16 +22,16 @@ RAW_TEST_FILES = data/alertTests.raw
|
|||||||
|
|
||||||
BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
|
BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
|
||||||
|
|
||||||
# test_bitcoin binary #
|
# test_darkcoin binary #
|
||||||
test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS)
|
test_darkcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS)
|
||||||
test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
|
test_darkcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||||
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
|
test_darkcoin_LDADD += $(LIBBITCOIN_WALLET)
|
||||||
endif
|
endif
|
||||||
test_bitcoin_LDADD += $(BDB_LIBS)
|
test_darkcoin_LDADD += $(BDB_LIBS)
|
||||||
|
|
||||||
test_bitcoin_SOURCES = \
|
test_darkcoin_SOURCES = \
|
||||||
alert_tests.cpp \
|
alert_tests.cpp \
|
||||||
allocator_tests.cpp \
|
allocator_tests.cpp \
|
||||||
base32_tests.cpp \
|
base32_tests.cpp \
|
||||||
@ -66,12 +66,12 @@ test_bitcoin_SOURCES = \
|
|||||||
$(JSON_TEST_FILES) $(RAW_TEST_FILES)
|
$(JSON_TEST_FILES) $(RAW_TEST_FILES)
|
||||||
|
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
test_bitcoin_SOURCES += \
|
test_darkcoin_SOURCES += \
|
||||||
accounting_tests.cpp \
|
accounting_tests.cpp \
|
||||||
wallet_tests.cpp \
|
wallet_tests.cpp \
|
||||||
rpc_wallet_tests.cpp
|
rpc_wallet_tests.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
nodist_test_bitcoin_SOURCES = $(BUILT_SOURCES)
|
nodist_test_darkcoin_SOURCES = $(BUILT_SOURCES)
|
||||||
|
|
||||||
CLEANFILES = *.gcda *.gcno $(BUILT_SOURCES)
|
CLEANFILES = *.gcda *.gcno $(BUILT_SOURCES)
|
||||||
|
Loading…
Reference in New Issue
Block a user