diff --git a/.gitignore b/.gitignore index 7615fe391..0b631a023 100644 --- a/.gitignore +++ b/.gitignore @@ -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 @@ -13,8 +13,8 @@ autom4te.cache/ config.log config.status configure -src/bitcoin-config.h -src/bitcoin-config.h.in +src/dogecoin-config.h +src/dogecoin-config.h.in src/build-aux/ src/stamp-h1 share/setup.nsi @@ -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 @@ -78,7 +78,7 @@ coverage_percent.txt linux-coverage-build linux-build win32-build -qa/pull-tester/run-bitcoind-for-test.sh +qa/pull-tester/run-dogecoind-for-test.sh qa/pull-tester/build-tests.sh !src/leveldb*/Makefile diff --git a/Makefile.am b/Makefile.am index 4f623f6c6..a122c0210 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,9 @@ 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 diff --git a/configure.ac b/configure.ac index 6f7d8d19a..2a971d005 100644 --- a/configure.ac +++ b/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],[dogecoin]) 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 diff --git a/src/.gitignore b/src/.gitignore index c45f62adf..ef96252e6 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,3 +1,3 @@ -test_bitcoin +test_dogecoin diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4 index e71ecd717..ca7ae09ad 100644 --- a/src/m4/bitcoin_qt.m4 +++ b/src/m4/bitcoin_qt.m4 @@ -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 diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index b7f4312cd..f9fc1094e 100644 --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -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));