From 97600bbfba42e0dad522b7ddec4223a478f48e17 Mon Sep 17 00:00:00 2001 From: vertoe Date: Mon, 16 Feb 2015 23:05:58 +0100 Subject: [PATCH] Rename darkcoin resource files for windows. --- src/Makefile.am | 4 +-- src/bitcoin-cli-res.rc | 12 +++---- src/bitcoind-res.rc | 12 +++---- src/darkcoin-cli-res.rc | 36 +++++++++++++++++++ src/darkcoind-res.rc | 36 +++++++++++++++++++ src/qt/Makefile.am | 4 +-- .../{bitcoin-qt-res.rc => darkcoin-qt-res.rc} | 2 +- 7 files changed, 89 insertions(+), 17 deletions(-) create mode 100644 src/darkcoin-cli-res.rc create mode 100644 src/darkcoind-res.rc rename src/qt/res/{bitcoin-qt-res.rc => darkcoin-qt-res.rc} (94%) diff --git a/src/Makefile.am b/src/Makefile.am index 85aaac2b3..31c6849e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -203,7 +203,7 @@ darkcoind_SOURCES = darkcoind.cpp # if TARGET_WINDOWS -darkcoind_SOURCES += bitcoind-res.rc +darkcoind_SOURCES += darkcoind-res.rc endif AM_CPPFLAGS += $(BDB_CPPFLAGS) @@ -218,7 +218,7 @@ darkcoin_cli_SOURCES = darkcoin-cli.cpp # if TARGET_WINDOWS -darkcoin_cli_SOURCES += bitcoin-cli-res.rc +darkcoin_cli_SOURCES += darkcoin-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 diff --git a/src/bitcoin-cli-res.rc b/src/bitcoin-cli-res.rc index f8bfb3a88..1fdbed674 100644 --- a/src/bitcoin-cli-res.rc +++ b/src/bitcoin-cli-res.rc @@ -5,7 +5,7 @@ #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core developers" +#define COPYRIGHT_STR "2014-" STRINGIZE(COPYRIGHT_YEAR) " The Darkcoin Core developers" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION @@ -17,14 +17,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", "Bitcoin-cli (OSS RPC client for Bitcoin)" + VALUE "CompanyName", "Darkcoin" + VALUE "FileDescription", "Darkcoin-cli (OSS RPC client for Darkcoin)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "bitcoin-cli" + VALUE "InternalName", "darkcoin-cli" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "bitcoin-cli.exe" - VALUE "ProductName", "Bitcoin-cli" + VALUE "OriginalFilename", "darkcoin-cli.exe" + VALUE "ProductName", "Darkcoin-cli" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/bitcoind-res.rc b/src/bitcoind-res.rc index dc5c56b79..4991e92d2 100644 --- a/src/bitcoind-res.rc +++ b/src/bitcoind-res.rc @@ -5,7 +5,7 @@ #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core developers" +#define COPYRIGHT_STR "2014-" STRINGIZE(COPYRIGHT_YEAR) " The Darkcoin Core developers" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION @@ -17,14 +17,14 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", "Bitcoind (OSS daemon/client for Bitcoin)" + VALUE "CompanyName", "Darkcoin" + VALUE "FileDescription", "Darkcoind (OSS daemon/client for Darkcoin)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "bitcoind" + VALUE "InternalName", "darkcoind" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "bitcoind.exe" - VALUE "ProductName", "Bitcoind" + VALUE "OriginalFilename", "darkcoind.exe" + VALUE "ProductName", "Darkcoind" VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/darkcoin-cli-res.rc b/src/darkcoin-cli-res.rc new file mode 100644 index 000000000..1fdbed674 --- /dev/null +++ b/src/darkcoin-cli-res.rc @@ -0,0 +1,36 @@ +#include // needed for VERSIONINFO +#include "clientversion.h" // holds the needed client version information + +#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD +#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) +#define VER_FILEVERSION VER_PRODUCTVERSION +#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR +#define COPYRIGHT_STR "2014-" STRINGIZE(COPYRIGHT_YEAR) " The Darkcoin Core developers" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // U.S. English - multilingual (hex) + BEGIN + VALUE "CompanyName", "Darkcoin" + VALUE "FileDescription", "Darkcoin-cli (OSS RPC client for Darkcoin)" + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", "darkcoin-cli" + VALUE "LegalCopyright", COPYRIGHT_STR + VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." + VALUE "OriginalFilename", "darkcoin-cli.exe" + VALUE "ProductName", "Darkcoin-cli" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal) + END +END diff --git a/src/darkcoind-res.rc b/src/darkcoind-res.rc new file mode 100644 index 000000000..4991e92d2 --- /dev/null +++ b/src/darkcoind-res.rc @@ -0,0 +1,36 @@ +#include // needed for VERSIONINFO +#include "clientversion.h" // holds the needed client version information + +#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD +#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) +#define VER_FILEVERSION VER_PRODUCTVERSION +#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR +#define COPYRIGHT_STR "2014-" STRINGIZE(COPYRIGHT_YEAR) " The Darkcoin Core developers" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEOS VOS_NT_WINDOWS32 +FILETYPE VFT_APP +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" // U.S. English - multilingual (hex) + BEGIN + VALUE "CompanyName", "Darkcoin" + VALUE "FileDescription", "Darkcoind (OSS daemon/client for Darkcoin)" + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", "darkcoind" + VALUE "LegalCopyright", COPYRIGHT_STR + VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." + VALUE "OriginalFilename", "darkcoind.exe" + VALUE "ProductName", "Darkcoind" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal) + END +END diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 875d8718f..63e248983 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -281,7 +281,7 @@ RES_IMAGES = \ RES_MOVIES = $(wildcard res/movies/spinner-*.png) -BITCOIN_RC = res/bitcoin-qt-res.rc +DARKCOIN_RC = res/darkcoin-qt-res.rc libdarkcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ -I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES) @@ -306,7 +306,7 @@ if TARGET_DARWIN darkcoin_qt_SOURCES += $(BITCOIN_MM) endif if TARGET_WINDOWS - darkcoin_qt_SOURCES += $(BITCOIN_RC) + darkcoin_qt_SOURCES += $(DARKCOIN_RC) endif darkcoin_qt_LDADD = libdarkcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/darkcoin-qt-res.rc similarity index 94% rename from src/qt/res/bitcoin-qt-res.rc rename to src/qt/res/darkcoin-qt-res.rc index cbbfac1a2..6e463f108 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/darkcoin-qt-res.rc @@ -8,7 +8,7 @@ IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR -#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers" +#define COPYRIGHT_STR "2014-" STRINGIZE(COPYRIGHT_YEAR) " The Darkcoin developers" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION