maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #370 from rnicoll/1.7-dev-code_references

Browse source 
Update binary names to be doge-applicable
This commit is contained in:
langerhans 2014-03-28 22:45:51 +01:00
parent f82ad5bf43 e6fe2ce33a
commit 9cb3d9cbc8
14 changed files with 63 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.gitignore vendored
View file

@ -1,11 +1,11 @@
*.tar.gz *.tar.gz
*.exe *.exe
src/bitcoin src/dogecoin
src/bitcoind src/dogecoind
src/bitcoin-cli src/dogecoin-cli
src/test/test_bitcoin src/test/test_dogecoin
src/qt/test/test_bitcoin-qt src/qt/test/test_dogecoin-qt
Makefile.in Makefile.in
aclocal.m4 aclocal.m4
@ -35,7 +35,7 @@ src/qt/test/moc*.cpp
*.orig *.orig
*.o *.o
*.patch *.patch
.bitcoin .dogecoin
*.a *.a
*.pb.cc *.pb.cc
*.pb.h *.pb.h
@ -50,12 +50,12 @@ src/qt/test/moc*.cpp
# Compilation and Qt preprocessor part # Compilation and Qt preprocessor part
*.qm *.qm
Makefile Makefile
bitcoin-qt dogecoin-qt
Bitcoin-Qt.app Dogecoin-Qt.app
# Unit-tests # Unit-tests
Makefile.test Makefile.test
bitcoin-qt_test dogecoin-qt_test
# Resources cpp # Resources cpp
qrc_*.cpp qrc_*.cpp
@ -70,7 +70,7 @@ build
#lcov #lcov
*.gcno *.gcno
/*.info /*.info
test_bitcoin.coverage/ test_dogecoin.coverage/
total.coverage/ total.coverage/
coverage_percent.txt coverage_percent.txt

17
Makefile.am
View file

@ -4,17 +4,18 @@ SUBDIRS = src
GZIP_ENV="-9n" GZIP_ENV="-9n"
BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT) BITCOIND_BIN=$(top_builddir)/src/dogecoind$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT) BITCOIN_QT_BIN=$(top_builddir)/src/qt/dogecoin-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT) BITCOIN_CLI_BIN=$(top_builddir)/src/dogecoin-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=Dogecoin-Qt.app
OSX_DMG=Bitcoin-Qt.dmg OSX_DMG=Dogecoin-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
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed 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) 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) $(MKDIR_P) $(@D)
$(INSTALL) $< $@ $(INSTALL) $< $@
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN) $(OSX_APP)/Contents/MacOS/Dogecoin-Qt: $(BITCOIN_QT_BIN)
$(MKDIR_P) $(@D) $(MKDIR_P) $(@D)
$(INSTALL_STRIP_PROGRAM) $< $@ $(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/Dogecoin-Qt
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) $(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 if TARGET_DARWIN

14
configure.ac
View file

@ -6,7 +6,7 @@ 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, 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_AUX_DIR([src/build-aux])
AC_CONFIG_MACRO_DIR([src/m4]) AC_CONFIG_MACRO_DIR([src/m4])
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -476,8 +476,8 @@ AC_ARG_WITH([cli],
AC_ARG_WITH([daemon], AC_ARG_WITH([daemon],
[AS_HELP_STRING([--with-daemon], [AS_HELP_STRING([--with-daemon],
[with daemon (default is yes)])], [with daemon (default is yes)])],
[build_bitcoind=$withval], [build_dogecoind=$withval],
[build_bitcoind=yes]) [build_dogecoind=yes])
BITCOIN_QT_INIT BITCOIN_QT_INIT
@ -515,9 +515,9 @@ 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 dogecoind])
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_dogecoind = xyes])
AC_MSG_RESULT($build_bitcoind) AC_MSG_RESULT($build_dogecoind)
AC_MSG_CHECKING([whether to build bitcoin-cli]) AC_MSG_CHECKING([whether to build bitcoin-cli])
AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
@ -666,7 +666,7 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi 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]) AC_MSG_ERROR([No targets! Please specify at least one of: --enable-cli --enable-daemon --enable-gui or --enable-tests])
fi fi

2
src/.gitignore vendored
View file

@ -1,3 +1,3 @@
test_bitcoin test_dogecoin

34
src/Makefile.am
View file

@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(builddir)
noinst_LIBRARIES = \ noinst_LIBRARIES = \
libbitcoin_server.a \ libbitcoin_server.a \
libbitcoin_common.a \ libbitcoin_common.a \
libbitcoin_cli.a libdogecoin_cli.a
if ENABLE_WALLET if ENABLE_WALLET
noinst_LIBRARIES += libbitcoin_wallet.a noinst_LIBRARIES += libbitcoin_wallet.a
endif endif
@ -13,11 +13,11 @@ endif
bin_PROGRAMS = bin_PROGRAMS =
if BUILD_BITCOIND if BUILD_BITCOIND
bin_PROGRAMS += bitcoind bin_PROGRAMS += dogecoind
endif endif
if BUILD_BITCOIN_CLI if BUILD_BITCOIN_CLI
bin_PROGRAMS += bitcoin-cli bin_PROGRAMS += dogecoin-cli
endif endif
SUBDIRS = . $(BUILD_QT) $(BUILD_TEST) SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
@ -139,43 +139,43 @@ libbitcoin_common_a_SOURCES = \
version.cpp \ version.cpp \
$(BITCOIN_CORE_H) $(BITCOIN_CORE_H)
libbitcoin_cli_a_SOURCES = \ libdogecoin_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_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
# #
# bitcoind binary # # dogecoind binary #
bitcoind_LDADD = \ dogecoind_LDADD = \
libbitcoin_server.a \ libbitcoin_server.a \
libbitcoin_cli.a \ libdogecoin_cli.a \
libbitcoin_common.a \ libbitcoin_common.a \
$(LIBLEVELDB) \ $(LIBLEVELDB) \
$(LIBMEMENV) $(LIBMEMENV)
if ENABLE_WALLET if ENABLE_WALLET
bitcoind_LDADD += libbitcoin_wallet.a dogecoind_LDADD += libbitcoin_wallet.a
endif endif
bitcoind_SOURCES = bitcoind.cpp dogecoind_SOURCES = dogecoind.cpp
# #
if TARGET_WINDOWS if TARGET_WINDOWS
bitcoind_SOURCES += bitcoind-res.rc dogecoind_SOURCES += dogecoind-res.rc
endif endif
AM_CPPFLAGS += $(BDB_CPPFLAGS) AM_CPPFLAGS += $(BDB_CPPFLAGS)
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) dogecoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
# bitcoin-cli binary # # dogecoin-cli binary #
bitcoin_cli_LDADD = \ dogecoin_cli_LDADD = \
libbitcoin_cli.a \ libdogecoin_cli.a \
libbitcoin_common.a \ libbitcoin_common.a \
$(BOOST_LIBS) $(BOOST_LIBS)
bitcoin_cli_SOURCES = bitcoin-cli.cpp dogecoin_cli_SOURCES = dogecoin-cli.cpp
# #
if TARGET_WINDOWS if TARGET_WINDOWS
bitcoin_cli_SOURCES += bitcoin-cli-res.rc dogecoin_cli_SOURCES += dogecoin-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
@ -186,7 +186,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: $(libbitcoin_server_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libdogecoin_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

0
src/bitcoin-cli-res.rc → src/dogecoin-cli-res.rc
View file

0
src/bitcoin-cli.cpp → src/dogecoin-cli.cpp
View file

0
src/bitcoind-res.rc → src/dogecoind-res.rc
View file

0
src/bitcoind.cpp → src/dogecoind.cpp
View file

4
src/m4/bitcoin_qt.m4
View file

@ -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; dogecoin-qt frontend will not be built])
fi fi
bitcoin_enable_qt=no bitcoin_enable_qt=no
else else
@ -117,7 +117,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 Dogecoin 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

32
src/qt/Makefile.am
View file

@ -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 = dogecoin-qt
noinst_LIBRARIES = libbitcoinqt.a noinst_LIBRARIES = libbitcoinqt.a
SUBDIRS = $(BUILD_TEST_QT) SUBDIRS = $(BUILD_TEST_QT)
DIST_SUBDIRS = test DIST_SUBDIRS = test
# bitcoin qt core # # dogecoin qt core #
QT_TS = \ QT_TS = \
locale/bitcoin_ach.ts \ locale/bitcoin_ach.ts \
locale/bitcoin_af_ZA.ts \ locale/bitcoin_af_ZA.ts \
@ -148,7 +148,7 @@ QT_MOC_CPP = \
moc_walletmodel.cpp \ moc_walletmodel.cpp \
moc_walletview.cpp moc_walletview.cpp
BITCOIN_MM = \ DOGECOIN_MM = \
macdockiconhandler.mm \ macdockiconhandler.mm \
macnotificationhandler.mm macnotificationhandler.mm
@ -158,8 +158,8 @@ QT_MOC = \
overviewpage.moc \ overviewpage.moc \
rpcconsole.moc rpcconsole.moc
QT_QRC_CPP = qrc_bitcoin.cpp QT_QRC_CPP = qrc_dogecoin.cpp
QT_QRC = bitcoin.qrc QT_QRC = dogecoin.qrc
PROTOBUF_CC = paymentrequest.pb.cc PROTOBUF_CC = paymentrequest.pb.cc
PROTOBUF_H = paymentrequest.pb.h PROTOBUF_H = paymentrequest.pb.h
@ -317,7 +317,7 @@ RES_IMAGES = \
RES_MOVIES = $(wildcard res/movies/spinner-*.png) 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) \ libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms $(QT_DBUS_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): $(PROTOBUF_H)
$(QT_MOC_CPP): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H)
# bitcoin-qt binary # # dogecoin-qt binary #
bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ dogecoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms -I$(top_srcdir)/src/qt/forms
bitcoin_qt_SOURCES = bitcoin.cpp dogecoin_qt_SOURCES = bitcoin.cpp
if TARGET_DARWIN if TARGET_DARWIN
bitcoin_qt_SOURCES += $(BITCOIN_MM) dogecoin_qt_SOURCES += $(DOGECOIN_MM)
endif endif
if TARGET_WINDOWS if TARGET_WINDOWS
bitcoin_qt_SOURCES += $(BITCOIN_RC) dogecoin_qt_SOURCES += $(DOGECOIN_RC)
endif endif
bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) dogecoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
if ENABLE_WALLET if ENABLE_WALLET
bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) dogecoin_qt_LDADD += $(LIBBITCOIN_WALLET)
endif 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) $(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 # 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))))
@ -364,7 +364,7 @@ QT_QM=$(QT_TS:.ts=.qm)
bitcoinstrings.cpp: FORCE bitcoinstrings.cpp: FORCE
$(MAKE) -C $(top_srcdir)/src qt/bitcoinstrings.cpp $(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" @test -n $(LUPDATE) || echo "lupdate is required for updating translations"
@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

0
src/qt/bitcoin.qrc → src/qt/dogecoin.qrc
View file

0
src/qt/res/bitcoin-qt-res.rc → src/qt/res/dogecoin-qt-res.rc
View file

2
src/test/main_tests.cpp
View file

@ -9,7 +9,7 @@ BOOST_AUTO_TEST_CASE(subsidy_limit_test)
{ {
uint64_t nSum = 0; uint64_t nSum = 0;
for (int nHeight = 0; nHeight < 7000000; nHeight += 1000) { 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); BOOST_CHECK(nSubsidy <= 50 * COIN);
nSum += nSubsidy * 1000; nSum += nSubsidy * 1000;
BOOST_CHECK(MoneyRange(nSum)); BOOST_CHECK(MoneyRange(nSum));