Revert "bitcoin to mastercore" renaming

This reverts commit ba5559c.
This reverts commit dde7467.

Intended as quick workaround to use original Gitian files.

.gitignore

@@ -2,8 +2,8 @@
 
 *.exe
 src/bitcoin
-src/mastercored
-src/mastercore-cli
+src/bitcoind
+src/bitcoin-cli
 src/test/test_bitcoin
 src/qt/test/test_bitcoin-qt
 
@@ -51,7 +51,7 @@ src/qt/test/moc*.cpp
 # Compilation and Qt preprocessor part
 *.qm
 Makefile
-mastercore-qt
+bitcoin-qt
 Bitcoin-Qt.app
 
 # Unit-tests

Makefile.am

@@ -4,9 +4,9 @@ SUBDIRS = src
 
 GZIP_ENV="-9n"
 
-BITCOIND_BIN=$(top_builddir)/src/mastercored$(EXEEXT)
-BITCOIN_QT_BIN=$(top_builddir)/src/qt/mastercore-qt$(EXEEXT)
-BITCOIN_CLI_BIN=$(top_builddir)/src/mastercore-cli$(EXEEXT)
+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)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
 
 OSX_APP=Bitcoin-Qt.app

src/Makefile.am

@@ -13,11 +13,11 @@ endif
 bin_PROGRAMS =
 
 if BUILD_BITCOIND
-  bin_PROGRAMS += mastercored
+  bin_PROGRAMS += bitcoind
 endif
 
 if BUILD_BITCOIN_CLI
-  bin_PROGRAMS += mastercore-cli
+  bin_PROGRAMS += bitcoin-cli
 endif
 
 SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
@@ -158,35 +158,35 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
 #
 
 # bitcoind binary #
-mastercored_LDADD = \
+bitcoind_LDADD = \
   libbitcoin_server.a \
   libbitcoin_cli.a \
   libbitcoin_common.a \
   $(LIBLEVELDB) \
   $(LIBMEMENV)
 if ENABLE_WALLET
-mastercored_LDADD += libbitcoin_wallet.a
+bitcoind_LDADD += libbitcoin_wallet.a
 endif
-mastercored_SOURCES = bitcoind.cpp
+bitcoind_SOURCES = bitcoind.cpp
 #
 
 if TARGET_WINDOWS
-mastercored_SOURCES += bitcoind-res.rc
+bitcoind_SOURCES += bitcoind-res.rc
 endif
 
 AM_CPPFLAGS += $(BDB_CPPFLAGS)
-mastercored_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
+bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
 
 # bitcoin-cli binary #
-mastercore_cli_LDADD = \
+bitcoin_cli_LDADD = \
   libbitcoin_cli.a \
   libbitcoin_common.a \
   $(BOOST_LIBS)
-mastercore_cli_SOURCES = bitcoin-cli.cpp
+bitcoin_cli_SOURCES = bitcoin-cli.cpp
 #
 
 if TARGET_WINDOWS
-mastercore_cli_SOURCES += bitcoin-cli-res.rc
+bitcoin_cli_SOURCES += bitcoin-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

src/qt/Makefile.am

@@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \
   -I$(top_builddir)/src/qt/forms \
   $(PROTOBUF_CFLAGS) \
   $(QR_CFLAGS)
-bin_PROGRAMS = mastercore-qt
+bin_PROGRAMS = bitcoin-qt
 noinst_LIBRARIES = libbitcoinqt.a
 SUBDIRS = . $(BUILD_TEST_QT)
 DIST_SUBDIRS = . test
@@ -349,22 +349,22 @@ $(QT_MOC): $(PROTOBUF_H)
 $(QT_MOC_CPP): $(PROTOBUF_H)
 
 # bitcoin-qt binary #
-mastercore_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
+bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
   -I$(top_srcdir)/src/qt/forms
-mastercore_qt_SOURCES = bitcoin.cpp
+bitcoin_qt_SOURCES = bitcoin.cpp
 if TARGET_DARWIN
-  mastercore_qt_SOURCES += $(BITCOIN_MM)
+  bitcoin_qt_SOURCES += $(BITCOIN_MM)
 endif
 if TARGET_WINDOWS
-  mastercore_qt_SOURCES += $(BITCOIN_RC)
+  bitcoin_qt_SOURCES += $(BITCOIN_RC)
 endif
-mastercore_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
+bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
 if ENABLE_WALLET
-mastercore_qt_LDADD += $(LIBBITCOIN_WALLET)
+bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
 endif
-mastercore_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
+bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
   $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
-mastercore_qt_LDFLAGS = $(QT_LDFLAGS)
+bitcoin_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))))