From ff297e04bcbbd64515ff45d7751a46bc880198a1 Mon Sep 17 00:00:00 2001 From: barrystyle Date: Sat, 3 Aug 2019 13:39:53 +0800 Subject: [PATCH] Rename base fileset in least disruptive way. --- configure.ac | 30 ++-- ...ensus.pc.in => libpacglobalconsensus.pc.in | 0 src/Makefile.am | 160 +++++++++--------- src/Makefile.qt.include | 43 ++--- src/{dash-cli-res.rc => pacglobal-cli-res.rc} | 10 +- src/{dash-cli.cpp => pacglobal-cli.cpp} | 0 src/{dash-tx.cpp => pacglobal-tx.cpp} | 0 src/{dashd.cpp => pacglobald.cpp} | 0 8 files changed, 122 insertions(+), 121 deletions(-) rename libdashconsensus.pc.in => libpacglobalconsensus.pc.in (100%) rename src/{dash-cli-res.rc => pacglobal-cli-res.rc} (80%) rename src/{dash-cli.cpp => pacglobal-cli.cpp} (100%) rename src/{dash-tx.cpp => pacglobal-tx.cpp} (100%) rename src/{dashd.cpp => pacglobald.cpp} (100%) diff --git a/configure.ac b/configure.ac index f0c644a770573..c5720cce61030 100644 --- a/configure.ac +++ b/configure.ac @@ -7,17 +7,17 @@ define(_CLIENT_VERSION_BUILD, 2) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) -define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]]) -AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/dashpay/dash/issues],[dashcore],[https://dash.org/]) +define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[PACGlobal]]) +AC_INIT([PACGlobal],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/PACGlobalOfficial/PAC/issues],[pacglobal],[https://pacglobal.io/]) AC_CONFIG_SRCDIR([src/validation.cpp]) -AC_CONFIG_HEADERS([src/config/dash-config.h]) +AC_CONFIG_HEADERS([src/config/pacglobal-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -BITCOIN_DAEMON_NAME=dashd -BITCOIN_GUI_NAME=dash-qt -BITCOIN_CLI_NAME=dash-cli -BITCOIN_TX_NAME=dash-tx +BITCOIN_DAEMON_NAME=pacglobald +BITCOIN_GUI_NAME=pacglobal-qt +BITCOIN_CLI_NAME=pacglobal-cli +BITCOIN_TX_NAME=pacglobal-tx AC_CANONICAL_HOST @@ -286,7 +286,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS" AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build dash-cli dash-tx (default=yes)])], + [build pacglobal-cli pacglobal-tx (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -298,7 +298,7 @@ AC_ARG_WITH([libs], AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], - [build dashd daemon (default=yes)])], + [build pacglobald daemon (default=yes)])], [build_bitcoind=$withval], [build_bitcoind=yes]) @@ -489,7 +489,7 @@ AC_C_BIGENDIAN dnl Check for pthread compile/link requirements AX_PTHREAD -# The following macro will add the necessary defines to dash-config.h, but +# The following macro will add the necessary defines to pacglobal-config.h, but # they also need to be passed down to any subprojects. Pull the results out of # the cache and add them to CPPFLAGS. AC_SYS_LARGEFILE @@ -989,11 +989,11 @@ AC_SUBST(UNIVALUE_LIBS) BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) -AC_MSG_CHECKING([whether to build dashd]) +AC_MSG_CHECKING([whether to build pacglobald]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (dash-cli dash-tx)]) +AC_MSG_CHECKING([whether to build utils (pacglobal-cli pacglobal-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) @@ -1001,7 +1001,7 @@ AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) if test x$build_bitcoin_libs = xyes; then AC_DEFINE(HAVE_CONSENSUS_LIB, 1, [Define this symbol if the consensus lib has been built]) - AC_CONFIG_FILES([libdashconsensus.pc:libdashconsensus.pc.in]) + AC_CONFIG_FILES([libpacglobalconsensus.pc:libpacglobalconsensus.pc.in]) fi AC_MSG_RESULT($build_bitcoin_libs) @@ -1094,7 +1094,7 @@ if test x$bitcoin_enable_qt != xno; then AC_MSG_WARN("xgettext is required to update qt translations") fi - AC_MSG_CHECKING([whether to build test_dash-qt]) + AC_MSG_CHECKING([whether to build test_pacglobal-qt]) if test x$use_gui_tests$bitcoin_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="yes" @@ -1105,7 +1105,7 @@ fi AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"]) -AC_MSG_CHECKING([whether to build test_dash]) +AC_MSG_CHECKING([whether to build test_pacglobal]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="yes" diff --git a/libdashconsensus.pc.in b/libpacglobalconsensus.pc.in similarity index 100% rename from libdashconsensus.pc.in rename to libpacglobalconsensus.pc.in diff --git a/src/Makefile.am b/src/Makefile.am index 5a0fb548f4a89..361d76120de58 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,23 +50,23 @@ BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) BLS_LIBS=-lchiabls -lgmp -LIBBITCOIN_SERVER=libdash_server.a -LIBBITCOIN_COMMON=libdash_common.a -LIBBITCOIN_CONSENSUS=libdash_consensus.a -LIBBITCOIN_CLI=libdash_cli.a -LIBBITCOIN_UTIL=libdash_util.a -LIBBITCOIN_CRYPTO=crypto/libdash_crypto.a -LIBBITCOINQT=qt/libdashqt.a +LIBBITCOIN_SERVER=libpacglobal_server.a +LIBBITCOIN_COMMON=libpacglobal_common.a +LIBBITCOIN_CONSENSUS=libpacglobal_consensus.a +LIBBITCOIN_CLI=libpacglobal_cli.a +LIBBITCOIN_UTIL=libpacglobal_util.a +LIBBITCOIN_CRYPTO=crypto/libpacglobal_crypto.a +LIBBITCOINQT=qt/libpacglobalqt.a LIBSECP256K1=secp256k1/libsecp256k1.la if ENABLE_ZMQ -LIBBITCOIN_ZMQ=libdash_zmq.a +LIBBITCOIN_ZMQ=libpacglobal_zmq.a endif if BUILD_BITCOIN_LIBS -LIBBITCOINCONSENSUS=libdashconsensus.la +LIBBITCOINCONSENSUS=libpacglobalconsensus.la endif if ENABLE_WALLET -LIBBITCOIN_WALLET=libdash_wallet.a +LIBBITCOIN_WALLET=libpacglobal_wallet.a endif $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) @@ -91,15 +91,15 @@ TESTS = BENCHMARKS = if BUILD_BITCOIND - bin_PROGRAMS += dashd + bin_PROGRAMS += pacglobald endif if BUILD_BITCOIN_UTILS - bin_PROGRAMS += dash-cli dash-tx + bin_PROGRAMS += pacglobal-cli pacglobal-tx endif .PHONY: FORCE check-symbols check-security -# dash core # +# pacglobal core # BITCOIN_CORE_H = \ addrdb.h \ activemasternode.h \ @@ -254,12 +254,12 @@ obj/build.h: FORCE @$(MKDIR_P) $(builddir)/obj @$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \ $(abs_top_srcdir) -libdash_util_a-clientversion.$(OBJEXT): obj/build.h +libpacglobal_util_a-clientversion.$(OBJEXT): obj/build.h -# server: shared between dashd and dash-qt -libdash_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -libdash_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_server_a_SOURCES = \ +# server: shared between pacglobald and pacglobal-qt +libpacglobal_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) +libpacglobal_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libpacglobal_server_a_SOURCES = \ activemasternode.cpp \ addrman.cpp \ addrdb.cpp \ @@ -345,20 +345,20 @@ libdash_server_a_SOURCES = \ $(BITCOIN_CORE_H) if ENABLE_ZMQ -libdash_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) -libdash_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_zmq_a_SOURCES = \ +libpacglobal_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS) +libpacglobal_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libpacglobal_zmq_a_SOURCES = \ zmq/zmqabstractnotifier.cpp \ zmq/zmqnotificationinterface.cpp \ zmq/zmqpublishnotifier.cpp endif -# wallet: shared between dashd and dash-qt, but only linked +# wallet: shared between pacglobald and pacglobal-qt, but only linked # when wallet enabled -libdash_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_wallet_a_SOURCES = \ +libpacglobal_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libpacglobal_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libpacglobal_wallet_a_SOURCES = \ keepass.cpp \ privatesend-client.cpp \ privatesend-util.cpp \ @@ -371,9 +371,9 @@ libdash_wallet_a_SOURCES = \ $(BITCOIN_CORE_H) # crypto primitives library -crypto_libdash_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_CONFIG_INCLUDES) $(PIC_FLAGS) -crypto_libdash_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS) -crypto_libdash_crypto_a_SOURCES = \ +crypto_libpacglobal_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_CONFIG_INCLUDES) $(PIC_FLAGS) +crypto_libpacglobal_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS) +crypto_libpacglobal_crypto_a_SOURCES = \ crypto/aes.cpp \ crypto/aes.h \ crypto/common.h \ @@ -392,7 +392,7 @@ crypto_libdash_crypto_a_SOURCES = \ crypto/sha512.h # x11 -crypto_libdash_crypto_a_SOURCES += \ +crypto_libpacglobal_crypto_a_SOURCES += \ crypto/blake.c \ crypto/bmw.c \ crypto/cubehash.c \ @@ -418,9 +418,9 @@ crypto_libdash_crypto_a_SOURCES += \ crypto/sph_types.h # consensus: shared between all executables that validate any consensus rules. -libdash_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_consensus_a_SOURCES = \ +libpacglobal_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libpacglobal_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libpacglobal_consensus_a_SOURCES = \ amount.h \ arith_uint256.cpp \ arith_uint256.h \ @@ -455,10 +455,10 @@ libdash_consensus_a_SOURCES = \ utilstrencodings.h \ version.h -# common: shared between dashd, and dash-qt and non-server tools -libdash_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_common_a_SOURCES = \ +# common: shared between pacglobald, and pacglobal-qt and non-server tools +libpacglobal_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libpacglobal_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libpacglobal_common_a_SOURCES = \ amount.cpp \ base58.cpp \ bip39.cpp \ @@ -483,9 +483,9 @@ libdash_common_a_SOURCES = \ # util: shared between all executables. # This library *must* be included to make sure that the glibc # backward-compatibility objects and their sanity checks are linked. -libdash_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_util_a_SOURCES = \ +libpacglobal_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libpacglobal_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libpacglobal_util_a_SOURCES = \ bls/bls_batchverifier.h \ bls/bls_ies.cpp \ bls/bls_ies.h \ @@ -510,31 +510,31 @@ libdash_util_a_SOURCES = \ $(BITCOIN_CORE_H) if GLIBC_BACK_COMPAT -libdash_util_a_SOURCES += compat/glibc_compat.cpp +libpacglobal_util_a_SOURCES += compat/glibc_compat.cpp AM_LDFLAGS += -Wl,--wrap=log2f -Wl,--wrap=__divmoddi4 endif -# cli: shared between dash-cli and dash-qt -libdash_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -libdash_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -libdash_cli_a_SOURCES = \ +# cli: shared between pacglobal-cli and pacglobal-qt +libpacglobal_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +libpacglobal_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libpacglobal_cli_a_SOURCES = \ rpc/client.cpp \ $(BITCOIN_CORE_H) -nodist_libdash_util_a_SOURCES = $(srcdir)/obj/build.h +nodist_libpacglobal_util_a_SOURCES = $(srcdir)/obj/build.h # -# dashd binary # -dashd_SOURCES = dashd.cpp -dashd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -dashd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -dashd_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# pacglobald binary # +pacglobald_SOURCES = pacglobald.cpp +pacglobald_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +pacglobald_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +pacglobald_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -dashd_SOURCES += dashd-res.rc +pacglobald_SOURCES += pacglobald-res.rc endif -dashd_LDADD = \ +pacglobald_LDADD = \ $(LIBBITCOIN_SERVER) \ $(LIBBITCOIN_COMMON) \ $(LIBUNIVALUE) \ @@ -547,37 +547,37 @@ dashd_LDADD = \ $(LIBMEMENV) \ $(LIBSECP256K1) -dashd_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(BLS_LIBS) +pacglobald_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(ZMQ_LIBS) $(BLS_LIBS) -# dash-cli binary # -dash_cli_SOURCES = dash-cli.cpp -dash_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) -dash_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -dash_cli_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# pacglobal-cli binary # +pacglobal_cli_SOURCES = pacglobal-cli.cpp +pacglobal_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) +pacglobal_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +pacglobal_cli_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -dash_cli_SOURCES += dash-cli-res.rc +pacglobal_cli_SOURCES += pacglobal-cli-res.rc endif -dash_cli_LDADD = \ +pacglobal_cli_LDADD = \ $(LIBBITCOIN_CLI) \ $(LIBUNIVALUE) \ $(LIBBITCOIN_UTIL) \ $(LIBBITCOIN_CRYPTO) -dash_cli_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) $(BLS_LIBS) +pacglobal_cli_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(EVENT_LIBS) $(BLS_LIBS) # -# dash-tx binary # -dash_tx_SOURCES = dash-tx.cpp -dash_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -dash_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -dash_tx_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +# pacglobal-tx binary # +pacglobal_tx_SOURCES = pacglobal-tx.cpp +pacglobal_tx_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) +pacglobal_tx_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +pacglobal_tx_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) if TARGET_WINDOWS -dash_tx_SOURCES += dash-tx-res.rc +pacglobal_tx_SOURCES += pacglobal-tx-res.rc endif -dash_tx_LDADD = \ +pacglobal_tx_LDADD = \ $(LIBUNIVALUE) \ $(LIBBITCOIN_COMMON) \ $(LIBBITCOIN_UTIL) \ @@ -585,22 +585,22 @@ dash_tx_LDADD = \ $(LIBBITCOIN_CRYPTO) \ $(LIBSECP256K1) -dash_tx_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(CRYPTO_LIBS) $(BLS_LIBS) +pacglobal_tx_LDADD += $(BACKTRACE_LIB) $(BOOST_LIBS) $(CRYPTO_LIBS) $(BLS_LIBS) # -# dashconsensus library # +# pacglobalconsensus library # if BUILD_BITCOIN_LIBS include_HEADERS = script/dashconsensus.h -libdashconsensus_la_SOURCES = $(crypto_libdash_crypto_a_SOURCES) $(libdash_consensus_a_SOURCES) +libpacglobalconsensus_la_SOURCES = $(crypto_libpacglobal_crypto_a_SOURCES) $(libpacglobal_consensus_a_SOURCES) if GLIBC_BACK_COMPAT - libdashconsensus_la_SOURCES += compat/glibc_compat.cpp + libpacglobalconsensus_la_SOURCES += compat/glibc_compat.cpp endif -libdashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) -libdashconsensus_la_LIBADD = $(LIBSECP256K1) $(BLS_LIBS) -libdashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL -libdashconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +libpacglobalconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS) +libpacglobalconsensus_la_LIBADD = $(LIBSECP256K1) $(BLS_LIBS) +libpacglobalconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -DBUILD_BITCOIN_INTERNAL +libpacglobalconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) endif # @@ -634,12 +634,12 @@ EXTRA_DIST = $(CTAES_DIST) EXTRA_DIST += $(IMMER_DIST) -config/dash-config.h: config/stamp-h1 +config/pacglobal-config.h: config/stamp-h1 @$(MAKE) -C $(top_builddir) $(subdir)/$(@) -config/stamp-h1: $(top_srcdir)/$(subdir)/config/dash-config.h.in $(top_builddir)/config.status +config/stamp-h1: $(top_srcdir)/$(subdir)/config/pacglobal-config.h.in $(top_builddir)/config.status $(AM_V_at)$(MAKE) -C $(top_builddir) $(subdir)/$(@) -$(top_srcdir)/$(subdir)/config/dash-config.h.in: $(am__configure_deps) - $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/dash-config.h.in +$(top_srcdir)/$(subdir)/config/pacglobal-config.h.in: $(am__configure_deps) + $(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/pacglobal-config.h.in clean-local: -$(MAKE) -C secp256k1 clean diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index def7a409869d9..66c315a630024 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -3,8 +3,8 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -bin_PROGRAMS += qt/dash-qt -EXTRA_LIBRARIES += qt/libdashqt.a +bin_PROGRAMS += qt/pacglobal-qt +EXTRA_LIBRARIES += qt/libpacglobalqt.a # dash qt core # QT_TS = \ @@ -602,14 +602,14 @@ BITCOIN_RC = qt/res/dash-qt-res.rc BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \ -I$(builddir)/qt/forms -DQT_NO_KEYWORDS -qt_libdashqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_libpacglobalqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_libdashqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_libpacglobalqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -qt_libdashqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ +qt_libpacglobalqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \ $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES) -nodist_qt_libdashqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \ +nodist_qt_libpacglobalqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \ $(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP) # forms/foo.h -> forms/ui_foo.h @@ -618,7 +618,7 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI: # Most files will depend on the forms and moc files as includes. Generate them # before anything else. $(QT_MOC): $(QT_FORMS_H) -$(qt_libdashqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) : | $(QT_MOC) +$(qt_libpacglobalqt_a_OBJECTS) $(qt_pacglobal_qt_OBJECTS) : | $(QT_MOC) #Generating these with a half-written protobuf header leads to wacky results. #This makes sure it's done. @@ -626,36 +626,36 @@ $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) # dash-qt binary # -qt_dash_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ +qt_pacglobal_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ $(QT_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS) -qt_dash_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) +qt_pacglobal_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS) -qt_dash_qt_SOURCES = qt/dash.cpp +qt_pacglobal_qt_SOURCES = qt/dash.cpp if TARGET_DARWIN - qt_dash_qt_SOURCES += $(BITCOIN_MM) + qt_pacglobal_qt_SOURCES += $(BITCOIN_MM) endif if TARGET_WINDOWS - qt_dash_qt_SOURCES += $(BITCOIN_RC) + qt_pacglobal_qt_SOURCES += $(BITCOIN_RC) endif -qt_dash_qt_LDADD = qt/libdashqt.a $(LIBBITCOIN_SERVER) +qt_pacglobal_qt_LDADD = qt/libpacglobalqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET -qt_dash_qt_LDADD += $(LIBBITCOIN_WALLET) +qt_pacglobal_qt_LDADD += $(LIBBITCOIN_WALLET) endif if ENABLE_ZMQ -qt_dash_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) +qt_pacglobal_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS) endif -qt_dash_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ +qt_pacglobal_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \ $(BACKTRACE_LIB) $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \ $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(BLS_LIBS) -qt_dash_qt_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -qt_dash_qt_LIBTOOLFLAGS = --tag CXX +qt_pacglobal_qt_LDFLAGS = $(LDFLAGS_WRAP_EXCEPTIONS) $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) +qt_pacglobal_qt_LIBTOOLFLAGS = --tag CXX #locale/foo.ts -> locale/foo.qm QT_QM=$(QT_TS:.ts=.qm) SECONDARY: $(QT_QM) -$(srcdir)/qt/dashstrings.cpp: $(libdash_server_a_SOURCES) $(libdash_wallet_a_SOURCES) $(libdash_common_a_SOURCES) $(libdash_zmq_a_SOURCES) $(libdash_consensus_a_SOURCES) $(libdash_util_a_SOURCES) +$(srcdir)/qt/dashstrings.cpp: $(libpacglobal_server_a_SOURCES) $(libpacglobal_wallet_a_SOURCES) $(libpacglobal_common_a_SOURCES) $(libpacglobal_zmq_a_SOURCES) $(libpacglobal_consensus_a_SOURCES) $(libpacglobal_util_a_SOURCES) @test -n $(XGETTEXT) || echo "xgettext is required for updating translations" $(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^ @@ -675,12 +675,12 @@ $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(R $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $(RCCFLAGS) -name dash $< | \ $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ -CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno +CLEAN_QT = $(nodist_qt_libpacglobalqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno CLEANFILES += $(CLEAN_QT) dash_qt_clean: FORCE - rm -f $(CLEAN_QT) $(qt_libdashqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) qt/dash-qt$(EXEEXT) $(LIBBITCOINQT) + rm -f $(CLEAN_QT) $(qt_libpacglobalqt_a_OBJECTS) $(qt_pacglobal_qt_OBJECTS) qt/dash-qt$(EXEEXT) $(LIBBITCOINQT) dash_qt : qt/dash-qt$(EXEEXT) @@ -701,3 +701,4 @@ moc_%.cpp: %.h @test -f $(LRELEASE) @$(MKDIR_P) $(@D) $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@ + diff --git a/src/dash-cli-res.rc b/src/pacglobal-cli-res.rc similarity index 80% rename from src/dash-cli-res.rc rename to src/pacglobal-cli-res.rc index c464b0a0e505b..bee42e79b2325 100644 --- a/src/dash-cli-res.rc +++ b/src/pacglobal-cli-res.rc @@ -16,14 +16,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Dash" - VALUE "FileDescription", "dash-cli (JSON-RPC client for " PACKAGE_NAME ")" + VALUE "CompanyName", "PACGlobal" + VALUE "FileDescription", "pacglobal-cli (JSON-RPC client for " PACKAGE_NAME ")" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "dash-cli" + VALUE "InternalName", "pacglobal-cli" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "dash-cli.exe" - VALUE "ProductName", "dash-cli" + VALUE "OriginalFilename", "pacglobal-cli.exe" + VALUE "ProductName", "pacglobal-cli" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/dash-cli.cpp b/src/pacglobal-cli.cpp similarity index 100% rename from src/dash-cli.cpp rename to src/pacglobal-cli.cpp diff --git a/src/dash-tx.cpp b/src/pacglobal-tx.cpp similarity index 100% rename from src/dash-tx.cpp rename to src/pacglobal-tx.cpp diff --git a/src/dashd.cpp b/src/pacglobald.cpp similarity index 100% rename from src/dashd.cpp rename to src/pacglobald.cpp