diff --git a/gostcoin-qt.pro b/gostcoin-qt.pro index 816a4e1..4ae8faa 100644 --- a/gostcoin-qt.pro +++ b/gostcoin-qt.pro @@ -358,7 +358,7 @@ OTHER_FILES += README.md \ doc/*.rst \ doc/*.txt \ doc/*.md \ - src/qt/res/bitcoin-qt.rc \ + src/qt/res/gostcoin-qt.rc \ src/test/*.cpp \ src/test/*.h \ src/qt/test/*.cpp \ @@ -399,7 +399,7 @@ isEmpty(BOOST_INCLUDE_PATH) { } win32:DEFINES += WIN32 -win32:RC_FILE = src/qt/res/bitcoin-qt.rc +win32:RC_FILE = src/qt/res/gostcoin-qt.rc win32:!contains(MINGW_THREAD_BUGFIX, 0) { # At least qmake's win32-g++-cross profile is missing the -lmingwthrd diff --git a/src/clientversion.h b/src/clientversion.h index 25bef0b..bb9a131 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -5,7 +5,7 @@ // client versioning and copyright year // -// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it +// These need to be macros, as version.cpp's and gostcoin-qt.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 8 #define CLIENT_VERSION_REVISION 5 diff --git a/src/makefile.mingw b/src/makefile.mingw index db6c22b..90044b9 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -21,6 +21,7 @@ USE_IPV6:=1 USE_DEBUG:=0 DEPSDIR?=/usr/local +WINDRES = windres BOOST_SUFFIX?=-mt INCLUDEPATHS= \ @@ -101,7 +102,8 @@ OBJS= \ obj/noui.o \ obj/leveldb.o \ obj/txdb.o \ - obj/Gost.o + obj/Gost.o \ + obj/resources.o ifdef USE_SSE2 DEFS += -DUSE_SSE2 @@ -141,6 +143,9 @@ obj/%-sse2.o: %-sse2.cpp obj/%.o: %.cpp $(HEADERS) $(CXX) -c $(CFLAGS) -o $@ $< +obj/%.o : %.rc + $(WINDRES) -i $< -o $@ + gostcoind.exe: $(OBJS:obj/%=obj/%) $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/gostcoin-qt.rc similarity index 90% rename from src/qt/res/bitcoin-qt.rc rename to src/qt/res/gostcoin-qt.rc index 5d7889c..810ce39 100644 --- a/src/qt/res/bitcoin-qt.rc +++ b/src/qt/res/gostcoin-qt.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 2011-" STRINGIZE(COPYRIGHT_YEAR) " The Litecoin developers " STRINGIZE(COPYRIGHT_YEAR) "The Anoncoin developers" STRINGIZE(COPYRIGHT_YEAR) "The i2pd developers" STRINGIZE(COPYRIGHT_YEAR) "The Gostcoin developers" +#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers 2011-" STRINGIZE(COPYRIGHT_YEAR) " The Litecoin developers 2013-" STRINGIZE(COPYRIGHT_YEAR) " The Anoncoin developers 2013-" STRINGIZE(COPYRIGHT_YEAR) " The i2pd developers " STRINGIZE(COPYRIGHT_YEAR) " The Gostcoin developers" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION diff --git a/src/resources.rc b/src/resources.rc new file mode 100644 index 0000000..19fe52c --- /dev/null +++ b/src/resources.rc @@ -0,0 +1,39 @@ +IDI_ICON1 ICON DISCARDABLE "qt/res/icons/gostcoin.ico" +IDI_ICON2 ICON DISCARDABLE "qt/res/icons/bitcoin_testnet.ico" + +#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 "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers 2011-" STRINGIZE(COPYRIGHT_YEAR) " The Litecoin developers 2013-" STRINGIZE(COPYRIGHT_YEAR) " The Anoncoin developers 2013-" STRINGIZE(COPYRIGHT_YEAR) " The i2pd developers " STRINGIZE(COPYRIGHT_YEAR) " The Gostcoin 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", "GOSTSec" + VALUE "FileDescription", "Gostcoind (command-line daemon for Gostcoin)" + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", "gostcoind" + 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", "gostcoind.exe" + VALUE "ProductName", "Gostcoind" + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1252 // language neutral - multilingual (decimal) + END +END diff --git a/src/test/scrypt_tests.cpp b/src/test/scrypt_tests.cpp deleted file mode 100644 index c73de11..0000000 --- a/src/test/scrypt_tests.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include - -#include "util.h" -#include "scrypt.h" - -BOOST_AUTO_TEST_SUITE(scrypt_tests) - -BOOST_AUTO_TEST_CASE(scrypt_hashtest) -{ - // Test Scrypt hash with known inputs against expected outputs - #define HASHCOUNT 5 - const char* inputhex[HASHCOUNT] = { "020000004c1271c211717198227392b029a64a7971931d351b387bb80db027f270411e398a07046f7d4a08dd815412a8712f874a7ebf0507e3878bd24e20a3b73fd750a667d2f451eac7471b00de6659", "0200000011503ee6a855e900c00cfdd98f5f55fffeaee9b6bf55bea9b852d9de2ce35828e204eef76acfd36949ae56d1fbe81c1ac9c0209e6331ad56414f9072506a77f8c6faf551eac7471b00389d01", "02000000a72c8a177f523946f42f22c3e86b8023221b4105e8007e59e81f6beb013e29aaf635295cb9ac966213fb56e046dc71df5b3f7f67ceaeab24038e743f883aff1aaafaf551eac7471b0166249b", "010000007824bc3a8a1b4628485eee3024abd8626721f7f870f8ad4d2f33a27155167f6a4009d1285049603888fe85a84b6c803a53305a8d497965a5e896e1a00568359589faf551eac7471b0065434e", "0200000050bfd4e4a307a8cb6ef4aef69abc5c0f2d579648bd80d7733e1ccc3fbc90ed664a7f74006cb11bde87785f229ecd366c2d4e44432832580e0608c579e4cb76f383f7f551eac7471b00c36982" }; - const char* expected[HASHCOUNT] = { "00000000002bef4107f882f6115e0b01f348d21195dacd3582aa2dabd7985806" , "00000000003a0d11bdd5eb634e08b7feddcfbbf228ed35d250daf19f1c88fc94", "00000000000b40f895f288e13244728a6c2d9d59d8aff29c65f8dd5114a8ca81", "00000000003007005891cd4923031e99d8e8d72f6e8e7edc6a86181897e105fe", "000000000018f0b426a4afc7130ccb47fa02af730d345b4fe7c7724d3800ec8c" }; - uint256 scrypthash; - std::vector inputbytes; - char scratchpad[SCRYPT_SCRATCHPAD_SIZE]; - for (int i = 0; i < HASHCOUNT; i++) { - inputbytes = ParseHex(inputhex[i]); -#if defined(USE_SSE2) - // Test SSE2 scrypt - scrypt_1024_1_1_256_sp_sse2((const char*)&inputbytes[0], BEGIN(scrypthash), scratchpad); -#endif - // Test generic scrypt - scrypt_1024_1_1_256_sp_generic((const char*)&inputbytes[0], BEGIN(scrypthash), scratchpad); - BOOST_CHECK_EQUAL(scrypthash.ToString().c_str(), expected[i]); - } -} - -BOOST_AUTO_TEST_SUITE_END()