Merge pull request #370 from rnicoll/1.7-dev-code_references
Update binary names to be doge-applicable
This commit is contained in:
commit
9cb3d9cbc8
20
.gitignore
vendored
20
.gitignore
vendored
|
@ -1,11 +1,11 @@
|
|||
*.tar.gz
|
||||
|
||||
*.exe
|
||||
src/bitcoin
|
||||
src/bitcoind
|
||||
src/bitcoin-cli
|
||||
src/test/test_bitcoin
|
||||
src/qt/test/test_bitcoin-qt
|
||||
src/dogecoin
|
||||
src/dogecoind
|
||||
src/dogecoin-cli
|
||||
src/test/test_dogecoin
|
||||
src/qt/test/test_dogecoin-qt
|
||||
|
||||
Makefile.in
|
||||
aclocal.m4
|
||||
|
@ -35,7 +35,7 @@ src/qt/test/moc*.cpp
|
|||
*.orig
|
||||
*.o
|
||||
*.patch
|
||||
.bitcoin
|
||||
.dogecoin
|
||||
*.a
|
||||
*.pb.cc
|
||||
*.pb.h
|
||||
|
@ -50,12 +50,12 @@ src/qt/test/moc*.cpp
|
|||
# Compilation and Qt preprocessor part
|
||||
*.qm
|
||||
Makefile
|
||||
bitcoin-qt
|
||||
Bitcoin-Qt.app
|
||||
dogecoin-qt
|
||||
Dogecoin-Qt.app
|
||||
|
||||
# Unit-tests
|
||||
Makefile.test
|
||||
bitcoin-qt_test
|
||||
dogecoin-qt_test
|
||||
|
||||
# Resources cpp
|
||||
qrc_*.cpp
|
||||
|
@ -70,7 +70,7 @@ build
|
|||
#lcov
|
||||
*.gcno
|
||||
/*.info
|
||||
test_bitcoin.coverage/
|
||||
test_dogecoin.coverage/
|
||||
total.coverage/
|
||||
coverage_percent.txt
|
||||
|
||||
|
|
17
Makefile.am
17
Makefile.am
|
@ -4,17 +4,18 @@ SUBDIRS = src
|
|||
|
||||
GZIP_ENV="-9n"
|
||||
|
||||
BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
|
||||
BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
|
||||
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
|
||||
BITCOIND_BIN=$(top_builddir)/src/dogecoind$(EXEEXT)
|
||||
BITCOIN_QT_BIN=$(top_builddir)/src/qt/dogecoin-qt$(EXEEXT)
|
||||
BITCOIN_CLI_BIN=$(top_builddir)/src/dogecoin-cli$(EXEEXT)
|
||||
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
|
||||
|
||||
OSX_APP=Bitcoin-Qt.app
|
||||
OSX_DMG=Bitcoin-Qt.dmg
|
||||
OSX_APP=Dogecoin-Qt.app
|
||||
OSX_DMG=Dogecoin-Qt.dmg
|
||||
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
|
||||
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
|
||||
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
|
||||
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
|
||||
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
|
||||
|
||||
DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
|
||||
|
||||
|
@ -70,16 +71,16 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
|
|||
$(MKDIR_P) $(@D)
|
||||
$(INSTALL) $< $@
|
||||
|
||||
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
|
||||
$(OSX_APP)/Contents/MacOS/Dogecoin-Qt: $(BITCOIN_QT_BIN)
|
||||
$(MKDIR_P) $(@D)
|
||||
$(INSTALL_STRIP_PROGRAM) $< $@
|
||||
|
||||
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/MacOS/Bitcoin-Qt
|
||||
$(OSX_APP)/Contents/MacOS/Dogecoin-Qt
|
||||
|
||||
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
|
||||
$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
|
||||
$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
|
||||
|
||||
|
||||
if TARGET_DARWIN
|
||||
|
|
14
configure.ac
14
configure.ac
|
@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 0)
|
|||
define(_CLIENT_VERSION_BUILD, 0)
|
||||
define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||
define(_COPYRIGHT_YEAR, 2014)
|
||||
AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin])
|
||||
AC_INIT([Dogecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin])
|
||||
AC_CONFIG_AUX_DIR([src/build-aux])
|
||||
AC_CONFIG_MACRO_DIR([src/m4])
|
||||
AC_CANONICAL_HOST
|
||||
|
@ -476,8 +476,8 @@ AC_ARG_WITH([cli],
|
|||
AC_ARG_WITH([daemon],
|
||||
[AS_HELP_STRING([--with-daemon],
|
||||
[with daemon (default is yes)])],
|
||||
[build_bitcoind=$withval],
|
||||
[build_bitcoind=yes])
|
||||
[build_dogecoind=$withval],
|
||||
[build_dogecoind=yes])
|
||||
|
||||
BITCOIN_QT_INIT
|
||||
|
||||
|
@ -515,9 +515,9 @@ fi
|
|||
|
||||
BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
|
||||
|
||||
AC_MSG_CHECKING([whether to build bitcoind])
|
||||
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
|
||||
AC_MSG_RESULT($build_bitcoind)
|
||||
AC_MSG_CHECKING([whether to build dogecoind])
|
||||
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_dogecoind = xyes])
|
||||
AC_MSG_RESULT($build_dogecoind)
|
||||
|
||||
AC_MSG_CHECKING([whether to build bitcoin-cli])
|
||||
AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
|
||||
|
@ -666,7 +666,7 @@ else
|
|||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
if test "x$use_tests$build_bitcoind$use_qt" = "xnonono"; then
|
||||
if test "x$use_tests$build_dogecoind$use_qt" = "xnonono"; then
|
||||
AC_MSG_ERROR([No targets! Please specify at least one of: --enable-cli --enable-daemon --enable-gui or --enable-tests])
|
||||
fi
|
||||
|
||||
|
|
2
src/.gitignore
vendored
2
src/.gitignore
vendored
|
@ -1,3 +1,3 @@
|
|||
|
||||
test_bitcoin
|
||||
test_dogecoin
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(builddir)
|
|||
noinst_LIBRARIES = \
|
||||
libbitcoin_server.a \
|
||||
libbitcoin_common.a \
|
||||
libbitcoin_cli.a
|
||||
libdogecoin_cli.a
|
||||
if ENABLE_WALLET
|
||||
noinst_LIBRARIES += libbitcoin_wallet.a
|
||||
endif
|
||||
|
@ -13,11 +13,11 @@ endif
|
|||
bin_PROGRAMS =
|
||||
|
||||
if BUILD_BITCOIND
|
||||
bin_PROGRAMS += bitcoind
|
||||
bin_PROGRAMS += dogecoind
|
||||
endif
|
||||
|
||||
if BUILD_BITCOIN_CLI
|
||||
bin_PROGRAMS += bitcoin-cli
|
||||
bin_PROGRAMS += dogecoin-cli
|
||||
endif
|
||||
|
||||
SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
|
||||
|
@ -139,43 +139,43 @@ libbitcoin_common_a_SOURCES = \
|
|||
version.cpp \
|
||||
$(BITCOIN_CORE_H)
|
||||
|
||||
libbitcoin_cli_a_SOURCES = \
|
||||
libdogecoin_cli_a_SOURCES = \
|
||||
rpcclient.cpp \
|
||||
$(BITCOIN_CORE_H)
|
||||
|
||||
nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
|
||||
#
|
||||
|
||||
# bitcoind binary #
|
||||
bitcoind_LDADD = \
|
||||
# dogecoind binary #
|
||||
dogecoind_LDADD = \
|
||||
libbitcoin_server.a \
|
||||
libbitcoin_cli.a \
|
||||
libdogecoin_cli.a \
|
||||
libbitcoin_common.a \
|
||||
$(LIBLEVELDB) \
|
||||
$(LIBMEMENV)
|
||||
if ENABLE_WALLET
|
||||
bitcoind_LDADD += libbitcoin_wallet.a
|
||||
dogecoind_LDADD += libbitcoin_wallet.a
|
||||
endif
|
||||
bitcoind_SOURCES = bitcoind.cpp
|
||||
dogecoind_SOURCES = dogecoind.cpp
|
||||
#
|
||||
|
||||
if TARGET_WINDOWS
|
||||
bitcoind_SOURCES += bitcoind-res.rc
|
||||
dogecoind_SOURCES += dogecoind-res.rc
|
||||
endif
|
||||
|
||||
AM_CPPFLAGS += $(BDB_CPPFLAGS)
|
||||
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
|
||||
dogecoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
|
||||
|
||||
# bitcoin-cli binary #
|
||||
bitcoin_cli_LDADD = \
|
||||
libbitcoin_cli.a \
|
||||
# dogecoin-cli binary #
|
||||
dogecoin_cli_LDADD = \
|
||||
libdogecoin_cli.a \
|
||||
libbitcoin_common.a \
|
||||
$(BOOST_LIBS)
|
||||
bitcoin_cli_SOURCES = bitcoin-cli.cpp
|
||||
dogecoin_cli_SOURCES = dogecoin-cli.cpp
|
||||
#
|
||||
|
||||
if TARGET_WINDOWS
|
||||
bitcoin_cli_SOURCES += bitcoin-cli-res.rc
|
||||
dogecoin_cli_SOURCES += dogecoin-cli-res.rc
|
||||
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
|
||||
|
@ -186,7 +186,7 @@ leveldb/%.a:
|
|||
CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
|
||||
OPT="$(CXXFLAGS) $(CPPFLAGS)"
|
||||
|
||||
qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_cli_a_SOURCES)
|
||||
qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libdogecoin_cli_a_SOURCES)
|
||||
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
|
||||
@cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
|
|||
AC_DEFUN([BITCOIN_QT_FAIL],[
|
||||
if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then
|
||||
if test x$bitcoin_enable_qt != xno; then
|
||||
AC_MSG_WARN([$1; bitcoin-qt frontend will not be built])
|
||||
AC_MSG_WARN([$1; dogecoin-qt frontend will not be built])
|
||||
fi
|
||||
bitcoin_enable_qt=no
|
||||
else
|
||||
|
@ -117,7 +117,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
|
|||
|
||||
|
||||
dnl enable qt support
|
||||
AC_MSG_CHECKING(whether to build Bitcoin Core GUI)
|
||||
AC_MSG_CHECKING(whether to build Dogecoin Core GUI)
|
||||
BITCOIN_QT_CHECK([
|
||||
bitcoin_enable_qt=yes
|
||||
bitcoin_enable_qt_test=yes
|
||||
|
|
|
@ -5,12 +5,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \
|
|||
-I$(top_builddir)/src/qt/forms \
|
||||
$(PROTOBUF_CFLAGS) \
|
||||
$(QR_CFLAGS)
|
||||
bin_PROGRAMS = bitcoin-qt
|
||||
bin_PROGRAMS = dogecoin-qt
|
||||
noinst_LIBRARIES = libbitcoinqt.a
|
||||
SUBDIRS = $(BUILD_TEST_QT)
|
||||
DIST_SUBDIRS = test
|
||||
|
||||
# bitcoin qt core #
|
||||
# dogecoin qt core #
|
||||
QT_TS = \
|
||||
locale/bitcoin_ach.ts \
|
||||
locale/bitcoin_af_ZA.ts \
|
||||
|
@ -148,7 +148,7 @@ QT_MOC_CPP = \
|
|||
moc_walletmodel.cpp \
|
||||
moc_walletview.cpp
|
||||
|
||||
BITCOIN_MM = \
|
||||
DOGECOIN_MM = \
|
||||
macdockiconhandler.mm \
|
||||
macnotificationhandler.mm
|
||||
|
||||
|
@ -158,8 +158,8 @@ QT_MOC = \
|
|||
overviewpage.moc \
|
||||
rpcconsole.moc
|
||||
|
||||
QT_QRC_CPP = qrc_bitcoin.cpp
|
||||
QT_QRC = bitcoin.qrc
|
||||
QT_QRC_CPP = qrc_dogecoin.cpp
|
||||
QT_QRC = dogecoin.qrc
|
||||
|
||||
PROTOBUF_CC = paymentrequest.pb.cc
|
||||
PROTOBUF_H = paymentrequest.pb.h
|
||||
|
@ -317,7 +317,7 @@ RES_IMAGES = \
|
|||
|
||||
RES_MOVIES = $(wildcard res/movies/spinner-*.png)
|
||||
|
||||
BITCOIN_RC = res/bitcoin-qt-res.rc
|
||||
DOGECOIN_RC = res/dogecoin-qt-res.rc
|
||||
|
||||
libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
|
||||
-I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES)
|
||||
|
@ -334,23 +334,23 @@ BUILT_SOURCES = $(nodist_libbitcoinqt_a_SOURCES)
|
|||
$(QT_MOC): $(PROTOBUF_H)
|
||||
$(QT_MOC_CPP): $(PROTOBUF_H)
|
||||
|
||||
# bitcoin-qt binary #
|
||||
bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
|
||||
# dogecoin-qt binary #
|
||||
dogecoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
|
||||
-I$(top_srcdir)/src/qt/forms
|
||||
bitcoin_qt_SOURCES = bitcoin.cpp
|
||||
dogecoin_qt_SOURCES = bitcoin.cpp
|
||||
if TARGET_DARWIN
|
||||
bitcoin_qt_SOURCES += $(BITCOIN_MM)
|
||||
dogecoin_qt_SOURCES += $(DOGECOIN_MM)
|
||||
endif
|
||||
if TARGET_WINDOWS
|
||||
bitcoin_qt_SOURCES += $(BITCOIN_RC)
|
||||
dogecoin_qt_SOURCES += $(DOGECOIN_RC)
|
||||
endif
|
||||
bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
|
||||
dogecoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
|
||||
if ENABLE_WALLET
|
||||
bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||
dogecoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||
endif
|
||||
bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||
dogecoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
|
||||
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
||||
bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
||||
dogecoin_qt_LDFLAGS = $(QT_LDFLAGS)
|
||||
|
||||
# forms/foo.h -> forms/ui_foo.h
|
||||
QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))
|
||||
|
@ -364,7 +364,7 @@ QT_QM=$(QT_TS:.ts=.qm)
|
|||
bitcoinstrings.cpp: FORCE
|
||||
$(MAKE) -C $(top_srcdir)/src qt/bitcoinstrings.cpp
|
||||
|
||||
translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
|
||||
translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(DOGECOIN_MM)
|
||||
@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
|
||||
@QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/bitcoin_en.ts
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ BOOST_AUTO_TEST_CASE(subsidy_limit_test)
|
|||
{
|
||||
uint64_t nSum = 0;
|
||||
for (int nHeight = 0; nHeight < 7000000; nHeight += 1000) {
|
||||
uint64_t nSubsidy = GetBlockValue(nHeight, 0);
|
||||
uint64_t nSubsidy = GetBlockValue(nHeight, 0, 0);
|
||||
BOOST_CHECK(nSubsidy <= 50 * COIN);
|
||||
nSum += nSubsidy * 1000;
|
||||
BOOST_CHECK(MoneyRange(nSum));
|
||||
|
|
Loading…
Reference in a new issue