From f25171d26633a7cc988f63bb2bd5930280e19773 Mon Sep 17 00:00:00 2001 From: Andre Jochems Date: Tue, 14 Jun 2016 15:44:53 +0200 Subject: [PATCH] Release v3 updates --- casinocoin-qt-windows.pro | 6 ++- casinocoin-qt-windows.pro.user | 6 +-- contrib/release/favicon.ico | Bin 0 -> 3262 bytes contrib/release/post-install.txt | 11 +++- src/makefile.mingw | 48 ++++++++---------- src/net.cpp | 12 +++-- src/qt/forms/infopage.ui | 4 +- .../qml/QmlGUIExchangesListView.qml | 4 +- src/qt/twitter/twitterwidget.cpp | 2 +- windows-inno-script.iss | 10 ++-- 10 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 contrib/release/favicon.ico diff --git a/casinocoin-qt-windows.pro b/casinocoin-qt-windows.pro index 77948ff..b06bb74 100644 --- a/casinocoin-qt-windows.pro +++ b/casinocoin-qt-windows.pro @@ -16,6 +16,8 @@ BOOST_INCLUDE_PATH=C:/msys64/usr/src/deps32/boost_1_60_0 BDB_INCLUDE_PATH=C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix BDB_LIB_PATH=C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix BDB_LIB_SUFFIX=-4.8 +OPENSSL_INCLUDE_PATH=C:/msys64/usr/src/deps32/openssl-1.0.2g/include +OPENSSL_LIB_PATH=C:/msys64/usr/src/deps32/openssl-1.0.2g MINIUPNPC_INCLUDE_PATH=C:/msys64/usr/src/deps32/miniupnpc-1.9/include MINIUPNPC_LIB_PATH=C:/msys64/usr/src/deps32/miniupnpc-1.9 QRENCODE_INCLUDE_PATH=C:/msys64/usr/src/deps32/qrencode-3.4.4 @@ -424,8 +426,8 @@ RC_FILE = src/qt/res/bitcoin-qt.rc } # Set libraries and includes at end, to use platform-defined defaults if not overridden -INCLUDEPATH += $$BDB_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$BOOST_INCLUDE_PATH -LIBS += $$join(BDB_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) $$join(BOOST_LIB_PATH,,-L,) +INCLUDEPATH += $$BDB_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$BOOST_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH +LIBS += $$join(BDB_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,) $$join(BOOST_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX -lpthread # -lgdi32 has to happen after -lcrypto (see #681) LIBS += -lws2_32 -lole32 -lmswsock -loleaut32 -luuid -lgdi32 -lshlwapi diff --git a/casinocoin-qt-windows.pro.user b/casinocoin-qt-windows.pro.user index 86fc534..d5b4e09 100644 --- a/casinocoin-qt-windows.pro.user +++ b/casinocoin-qt-windows.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -62,7 +62,7 @@ Qt 5.6.0 (mingw32) Qt 5.6.0 (mingw32) {b3cf2641-46bb-4b28-b7a6-2713d9074823} - 1 + 0 0 0 @@ -73,7 +73,7 @@ qmake QtProjectManager.QMakeBuildStep - true + false "USE_UPNP=0" "USE_QRCODE=1" "USE_IPV6=1" false false diff --git a/contrib/release/favicon.ico b/contrib/release/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..72ff7bf36627277d35365a194d3d52c376e13e43 GIT binary patch literal 3262 zcma)f7TU^kBER^(YA=MX%YDPGA}N39R_kZNV=9o!x;`@ z%OAH+GvB75RKG=7lGove4EQWE?tDSKyonMF}k zM!L=+tgDr_!eHX?W5)@CKuUQynJ_}b@jUlgU7YCoL+6u|_LwWBURb9KF&qrWqtS3U zusmjwvBo?mNHAw6yO{}XPsdph00o?BpqXYl%p&s`)^f76pweP9IcY)+zO958%cV87 ztEh{Qj757)G14Z+>chAFRjtn98A` zz@CTFlo8@f##%|-yIQTjBnhMEdI#e%`1T9KUCsf7Qh%+mwozgH!!C|ynZ@Ud{2a$; zK^R5RKPyseg~MIf{V<<@iXtnvgWy8BTh~9zl4@gI#1@FVUBX=n6vrwILn;Ff=VM1! zU^hWF7MfiYZ9QzFOo+L*x_37!fW_?7w*H_Fj)l##(sSijJ+ZUkP(P{Olzo$^roPQ) z*^kci06^?_9EUA*!7;BjDVt3*dvGkcA=0FnPIBC0v(%{I9_ik9ri!+==h`gfl>#_k zZ5O7zF}i2pYT-IK4^{gDc~GTUNb`M4LfO4C*cSm>Ebi|YlN;@ro%-sw`elGs!I|YT zW8!Ot&34!qeD*@!+ zB`|4WsCQg>d6Nm+NE+k2AcoJ_WkMr~Qa06q%gXwsm*6tOfjkJi8v%i*4voAugw>8Z zB%N7)v7}Ty18y{uvAp_DTy;2UiqgJ_@qC(UDU0t#$q0QkYeK**EWk{xMP-d32`Jk+#qBE`i4pA@zAd<)@seqt3K`6aH?S zH|5@DvlM@Cgn0X}5U=ipc)1qhkDC8Bl%~Iw@ab=tLcFIp|L*GV8(I3R5-j>&gVkU* P*o}@x*G8hV-rM{Kb_?qa literal 0 HcmV?d00001 diff --git a/contrib/release/post-install.txt b/contrib/release/post-install.txt index 1ccae81..25f5b5c 100644 --- a/contrib/release/post-install.txt +++ b/contrib/release/post-install.txt @@ -1 +1,10 @@ -The wallet has been succesfully installed. Please be aware that this software makes use of OpenGL v2 rendering. On older machines or Virtual Machines that do not have recent video drivers this can cause graphics rendering problems. If this is the case then add the following parameter to your environment settings: QT_OPENGL_DLL = opengl32sw.dll \ No newline at end of file +The wallet has been succesfully installed. + +Please be aware of the following two requirements. + +- This software makes use of OpenSSL libraries. They may not yet be available on your machine. If you encounter issues with Redeeming Prypto codes or showing the Twitter feed on the Info page they are missing. Local laws may prohibit installing them so they are not installed with the wallet. In that case you must install the OpenSSL libraries manually. You can download and install the light version from https://slproweb.com/products/Win32OpenSSL.html + +- This software makes use of OpenGL v2 rendering. On older machines or Virtual Machines that do not have recent video drivers this can cause graphics rendering problems. If this is the case you can enable a software renderer. To do so add the following parameter to your environment settings via Control Panel -> System -> Advanced System Settings -> Environment Variables: + +Variable: QT_OPENGL_DLL +Value: opengl32sw.dll diff --git a/src/makefile.mingw b/src/makefile.mingw index 37e010b..8e55751 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -4,11 +4,6 @@ # Makefile for the MinGW g++ compiler/toolchain # -# Assumes Berkeley DB, Boost, and OpenSSL have all been compiled and installed -# into /usr/local (/usr/local/include, /usr/local/lib). -# -# If dependencies are somewhere else, run 'make DEPSDIR=/path/' -# # Boost libraries are given wacky names that include the particular version of # boost you're using; set BOOST_SUFFIX appropriately. # @@ -20,38 +15,37 @@ CXX ?= g++ USE_UPNP:=- USE_IPV6:=1 -DEPSDIR?=/usr/local -BOOST_SUFFIX?=-mgw49-mt-s-1_55 +BOOST_SUFFIX?=-mt INCLUDEPATHS= \ -I"$(CURDIR)" \ - -I"C:\deps\boost_1_55_0" \ - -I"C:\deps\db-4.8.30.NC\build_unix" \ - -I"C:\deps\openssl-1.0.2d\include" \ - -I"C:\deps\qrencode-3.4.3" + -I"C:/msys64/usr/src/deps32/boost_1_60_0" \ + -I"C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix" \ + -I"C:/msys64/usr/src/deps32/openssl-1.0.2g/include" \ + -I"C:/msys64/usr/src/deps32/qrencode-3.4.4" LIBPATHS= \ -L"$(CURDIR)/leveldb" \ - -L"C:\deps\boost_1_55_0\stage\lib" \ - -L"C:\deps\db-4.8.30.NC\build_unix" \ - -L"C:\deps\openssl-1.0.2d" \ - -L"C:\deps\qrencode-3.4.3\.libs" + -L"C:/msys64/usr/src/deps32/boost_1_60_0/stage/lib" \ + -L"C:/msys64/usr/src/deps32/db-4.8.30.NC/build_unix" \ + -L"C:/msys64/usr/src/deps32/openssl-1.0.2g" \ + -L"C:/msys64/usr/src/deps32/qrencode-3.4.4/.libs" LIBS= \ - -l leveldb \ - -l memenv \ - -l boost_system$(BOOST_SUFFIX) \ - -l boost_filesystem$(BOOST_SUFFIX) \ - -l boost_program_options$(BOOST_SUFFIX) \ - -l boost_thread$(BOOST_SUFFIX) \ - -l boost_chrono$(BOOST_SUFFIX) \ - -l db_cxx \ - -l ssl \ - -l crypto + -lleveldb \ + -lmemenv \ + -lboost_system$(BOOST_SUFFIX) \ + -lboost_filesystem$(BOOST_SUFFIX) \ + -lboost_program_options$(BOOST_SUFFIX) \ + -lboost_thread$(BOOST_SUFFIX) \ + -lboost_chrono$(BOOST_SUFFIX) \ + -ldb_cxx \ + -lssl \ + -lcrypto DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6 -D__NO_SYSTEM_INCLUDES DEBUGFLAGS=-g -CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -static +CFLAGS=-mthreads -O2 -std=c++11 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) -static # enable: ASLR, DEP and large address aware LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static @@ -69,7 +63,7 @@ ifneq (${USE_IPV6}, -) DEFS += -DUSE_IPV6=$(USE_IPV6) endif -LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi -l pthread +LIBS += -lmingwthrd -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lws2_32 -lmswsock -lshlwapi -lpthread # TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are HEADERS = $(wildcard *.h) diff --git a/src/net.cpp b/src/net.cpp index 52f4ce0..43d92f4 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1192,14 +1192,18 @@ void MapPort(bool) // The first name is used as information source for addrman. // The second name should resolve to a list of seed addresses. static const char *strMainNetDNSSeed[][2] = { - {"casinocoin.org seed", "seed.dig0.com"}, + {"casinocoin.org seed", "seed1.casinocoin.info"}, {"casinocoin.org seed s", "seed.casinocoin.org"}, - {"casinocoin.org seed #1", "seed1.dig0.com"}, + {"casinocoin.org seed t", "seed.dig0.com"}, + {"casinocoin.org seed #1", "seed2.casinocoin.info"}, {"casinocoin.org seed #1s", "seed1.casinocoin.org"}, - {"casinocoin.org seed #2", "seed2.dig0.com"}, + {"casinocoin.org seed #1t", "seed1.dig0.com"}, + {"casinocoin.org seed #2", "seed3.casinocoin.info"}, {"casinocoin.org seed #2s", "seed2.casinocoin.org"}, - {"casinocoin.org seed #3", "seed3.dig0.com"}, + {"casinocoin.org seed #2t", "seed2.dig0.com"}, + {"casinocoin.org seed #3", "seed4.casinocoin.info"}, {"casinocoin.org seed #3s", "seed3.casinocoin.org"}, + {"casinocoin.org seed #4", "seed5.casinocoin.info"}, {NULL, NULL} }; diff --git a/src/qt/forms/infopage.ui b/src/qt/forms/infopage.ui index ab18177..7836e0e 100644 --- a/src/qt/forms/infopage.ui +++ b/src/qt/forms/infopage.ui @@ -39,7 +39,7 @@ - 3 + 4 1 @@ -371,7 +371,7 @@ - 2 + 3 1 diff --git a/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml b/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml index 77965ea..6093e6f 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml @@ -212,7 +212,7 @@ GUIExchangesListView { id: id_exchangeTimeDescription anchors.left: id_exchangeLastUpdateTime.left - text: qsTr( "Time:" ) + text: qsTr( "Updated:" ) color: GUI20Skin.colorToolbarMainGradientEnd width: id_exchangeLastUpdateTime.width / 3 } @@ -220,7 +220,7 @@ GUIExchangesListView { id: id_exchangeTimeValue anchors.left: id_exchangeTimeDescription.right - text: qsTr( m_lastUpdateTime ) + text: m_lastUpdateTime + " UTC" font.bold: true color: GUI20Skin.colorTextActive } diff --git a/src/qt/twitter/twitterwidget.cpp b/src/qt/twitter/twitterwidget.cpp index e55329b..e0ee46a 100644 --- a/src/qt/twitter/twitterwidget.cpp +++ b/src/qt/twitter/twitterwidget.cpp @@ -32,7 +32,7 @@ QWidget* TwitterWidget::dockQmlToWidget() pPlaceHolder = QWidget::createWindowContainer( pTwitterWindow, this ); if ( pPlaceHolder ) { - pPlaceHolder->setMinimumSize( 500, 170 ); + pPlaceHolder->setMinimumSize( 300, 150 ); pPlaceHolder->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); } } diff --git a/windows-inno-script.iss b/windows-inno-script.iss index 6a24636..4dc77ca 100644 --- a/windows-inno-script.iss +++ b/windows-inno-script.iss @@ -2,7 +2,6 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Casinocoin" -#define MySetupAppName "casinocoin" #define MyAppVersion "3.0.0.0" #define MyAppPublisher "Casinocoin Foundation" #define MyAppURL "http://www.casinocoin.org" @@ -12,7 +11,7 @@ ; NOTE: The value of AppId uniquely identifies this application. ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{1698FEC3-9D7C-43F3-B379-9028E51F8B56} +AppId={{DFC9C26D-B51B-4EB5-A10C-1AA469AA73DA} AppName={#MyAppName} AppVersion={#MyAppVersion} ;AppVerName={#MyAppName} {#MyAppVersion} @@ -22,7 +21,10 @@ AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppName} DisableProgramGroupPage=yes -OutputBaseFilename={#MySetupAppName}-{#MyAppVersion}-setup +LicenseFile=.\contrib\release\DISCLAIMER +InfoAfterFile=.\contrib\release\post-install.txt +OutputBaseFilename={#MyAppName}-{#MyAppVersion}-setup +SetupIconFile=.\contrib\release\favicon.ico Compression=lzma SolidCompression=yes @@ -33,7 +35,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] +Source: "C:\Users\a.jochems\Documents\GitHub\casinocoin-development\release\casinocoin-qt.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\Users\a.jochems\Documents\GitHub\casinocoin-development\release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons]