diff --git a/.gitignore b/.gitignore index 0b631a023..51fd431c7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,8 @@ autom4te.cache/ config.log config.status configure -src/dogecoin-config.h -src/dogecoin-config.h.in +src/bitcoin-config.h +src/bitcoin-config.h.in src/build-aux/ src/stamp-h1 share/setup.nsi @@ -78,7 +78,7 @@ coverage_percent.txt linux-coverage-build linux-build win32-build -qa/pull-tester/run-dogecoind-for-test.sh +qa/pull-tester/run-bitcoind-for-test.sh qa/pull-tester/build-tests.sh !src/leveldb*/Makefile diff --git a/Makefile.am b/Makefile.am index a122c0210..d0912c13d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,12 +9,13 @@ 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 diff --git a/src/Makefile.am b/src/Makefile.am index a12bbc753..5af6f37f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 @@ -17,7 +17,7 @@ if BUILD_BITCOIND endif if BUILD_BITCOIN_CLI - bin_PROGRAMS += bitcoin-cli + bin_PROGRAMS += dogecoin-cli endif SUBDIRS = . $(BUILD_QT) $(BUILD_TEST) @@ -139,7 +139,7 @@ libbitcoin_common_a_SOURCES = \ version.cpp \ $(BITCOIN_CORE_H) -libbitcoin_cli_a_SOURCES = \ +libdogecoin_cli_a_SOURCES = \ rpcclient.cpp \ $(BITCOIN_CORE_H) @@ -149,7 +149,7 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h # dogecoind binary # dogecoind_LDADD = \ libbitcoin_server.a \ - libbitcoin_cli.a \ + libdogecoin_cli.a \ libbitcoin_common.a \ $(LIBLEVELDB) \ $(LIBMEMENV) @@ -166,16 +166,16 @@ endif AM_CPPFLAGS += $(BDB_CPPFLAGS) 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 diff --git a/src/bitcoin-cli-res.rc b/src/dogecoin-cli-res.rc similarity index 100% rename from src/bitcoin-cli-res.rc rename to src/dogecoin-cli-res.rc diff --git a/src/bitcoin-cli.cpp b/src/dogecoin-cli.cpp similarity index 100% rename from src/bitcoin-cli.cpp rename to src/dogecoin-cli.cpp diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 11e8ff274..4503c53e1 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -10,7 +10,7 @@ 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) @@ -339,10 +339,10 @@ dogecoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ -I$(top_srcdir)/src/qt/forms dogecoin_qt_SOURCES = bitcoin.cpp if TARGET_DARWIN - dogecoin_qt_SOURCES += $(BITCOIN_MM) + dogecoin_qt_SOURCES += $(DOGECOIN_MM) endif if TARGET_WINDOWS - dogecoin_qt_SOURCES += $(BITCOIN_RC) + dogecoin_qt_SOURCES += $(DOGECOIN_RC) endif dogecoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET @@ -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 diff --git a/src/qt/bitcoin.qrc b/src/qt/dogecoin.qrc similarity index 100% rename from src/qt/bitcoin.qrc rename to src/qt/dogecoin.qrc