PXN-Foundation · PCN-PXN · May 14, 2019 · Sep 10, 2018 · Jan 20, 2019 · Apr 7, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -1,74 +1,132 @@
 language: cpp
 sudo: required
-dist: trusty
-os:
-- linux
-- osx
+
+matrix:
+  include:
+  # Build Peepcoin-qt MAC
+  # OS X 10.13 (High Sierra)
+  - os: osx
+    sudo: required
+    before_install:
+        brew install git; 
+        brew install berkeley-db4;
+        brew install openssl; 
+        brew install boost@1.60; 
+        brew link boost@1.60 -f; 
+        brew upgrade wget;
+        wget -O qt.rb https://raw.githubusercontent.com/Homebrew/homebrew-core/a57d0deab976cd8dee32404abe73f63cc5fbd60d/Formula/qt.rb;
+        brew install ./qt.rb;
+        brew link qt -f; 
+        brew install libqrencode; 
+        git clone https://github.com/mattneub/appscript.git;
+        cd appscript/py-appscript/tags/py-appscript-1.0.0/;
+        sudo python2.7 setup.py install;
+        cd  ${TRAVIS_BUILD_DIR};
+        wget -O miniupnpc.tar.gz http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.9.20150206.tar.gz;
+        tar xvzf miniupnpc.tar.gz; 
+        mv miniupnpc-1.9.20150206 miniupnpc; 
+        cd miniupnpc; 
+        make -f Makefile upnpc-static; 
+        sudo INSTALLPREFIX=/usr/local make install; 
+    install: 
+        cd  ${TRAVIS_BUILD_DIR};
+        chmod 755 src/leveldb/build_detect_platform;
+        qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 Peepcoin-qt.pro;
+    script: make;
+        export QTDIR=/usr/local/Cellar/qt/5.11.1;
+        cd  ${TRAVIS_BUILD_DIR};
+        chmod -R 755 contrib;
+        echo "Before dmg packaging";
+        T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale);
+        python2.7 contrib/macdeploy/macdeployqtplus  -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist Peepcoin-Qt.app;
+        ls -ltr;
+        echo "DMG file";
+
+  # Build Peepcoin-qt
+  # Compile linux gui
+  - os: linux
+    dist: xenial
+    sudo: required
+    before_install:
+        sudo /etc/init.d/postgresql stop;
+        sudo systemctl enable mysql;
+        sudo service mysql start;
+        sudo apt dist-upgrade;
+        sudo systemctl disable mysql;
+        cd  ${TRAVIS_BUILD_DIR};
+        bash doc/unix-deps-install.sh;
+    install: cd  ${TRAVIS_BUILD_DIR};
+             chmod 755 src/leveldb/build_detect_platform;
+             qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 Peepcoin-qt.pro;
+    script: make;
+        strip peepcoin-qt;
+        tar -czvf peepcoin-qt.tar.gz peepcoin-qt;
+
+  # Build Peepcoind
+  # Compile linux daemon
+  - os: linux
+    dist: xenial
+    sudo: required
+    before_install:
+        sudo /etc/init.d/postgresql stop;
+        sudo systemctl enable mysql;
+        sudo service mysql start;
+        sudo apt dist-upgrade;
+        sudo systemctl disable mysql;
+        cd  ${TRAVIS_BUILD_DIR};
+        bash doc/unix-deps-install.sh;
+    install: cd  ${TRAVIS_BUILD_DIR};
+             chmod 755 src/leveldb/build_detect_platform;
+    script: cd  ${TRAVIS_BUILD_DIR}/src; 
+        make -f makefile.unix clean;
+        make -f makefile.unix RELEASE=1 STATIC=1;
+        strip peepcoind;
+        tar -czvf peepcoind.tar.gz peepcoind;
+
+  # Build Peepcoin
+  # Cross-compile Windows 32-bit 
+  - os: linux
+    dist: xenial
+    sudo: required
+    before_install:
+        sudo /etc/init.d/postgresql stop;
+        sudo systemctl enable mysql;
+        sudo service mysql start;
+        sudo apt dist-upgrade;
+        sudo systemctl disable mysql;
+        sudo apt-get install p7zip-full autoconf automake autopoint bash bison bzip2 cmake flex gettext git g++ gperf intltool libffi-dev libtool libltdl-dev libssl-dev libxml-parser-perl make openssl patch perl pkg-config python ruby scons sed unzip wget xz-utils -y;
+        sudo apt-get install libtool-bin -y;
+    script: bash src/mxe-build.sh windows32-qt;
 
-before_install:
-- if [[ $TRAVIS_OS_NAME == osx ]]; then 
-     brew install git; 
-     brew install berkeley-db4;
-     brew install openssl; 
-     brew install boost@1.60; 
-     brew link boost@1.60 -force; 
-     brew install qt5; 
-     brew link qt5 -force; 
-     brew install libqrencode; 
-     sudo easy_install appscript; 
-     brew install wget;
-     wget -O miniupnpc.tar.gz http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.9.20150206.tar.gz;
-     tar xvzf miniupnpc.tar.gz; 
-     mv miniupnpc-1.9.20150206 miniupnpc; 
-     cd miniupnpc; 
-     make -f Makefile upnpc-static; 
-     sudo INSTALLPREFIX=/usr/local make install; 
-     fi
-- if [[ $TRAVIS_OS_NAME == linux ]]; then 
-     sudo /etc/init.d/postgresql stop;
-     cd  ${TRAVIS_BUILD_DIR};
-     bash doc/unix-deps-install.sh;
-     sudo apt-get update;
-     fi
-
-install:
-- ls -ltr
-- cd  ${TRAVIS_BUILD_DIR}
-- chmod 755 src/leveldb/build_detect_platform
-- qmake RELEASE=1 USE_UPNP=1 USE_QRCODE=1 Peepcoin-qt.pro
-
-script:
-- make
-- if [[ $TRAVIS_OS_NAME == linux ]]; then 
-     bash src/mxe-build.sh windows32-qt;
-     bash src/mxe-build.sh windows64-qt;
-  fi
-before_deploy:
-- if [[ $TRAVIS_OS_NAME == linux ]]; then 
-  strip peepcoin-qt;
-  tar -czvf peepcoin-qt.tar.gz peepcoin-qt;
-  fi
-- if [[ $TRAVIS_OS_NAME == osx ]]; then 
-  export QTDIR=/usr/local/Cellar/qt/5.11.1;
-  chmod -R 755 contrib;
-  echo "Before dmg packaging";
-  T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale);
-  python2.7 contrib/macdeploy/macdeployqtplus  -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist Peepcoin-Qt.app;
-  ls -ltr;
-  echo "DMG file";
-  fi
+  # Build Peepcoin
+  # Cross-compile Windows 64-bit 
+  - os: linux
+    dist: xenial
+    sudo: required
+    before_install:
+        sudo /etc/init.d/postgresql stop;
+        sudo systemctl enable mysql;
+        sudo service mysql start;
+        sudo apt dist-upgrade;
+        sudo systemctl disable mysql;
+        sudo apt-get install p7zip-full autoconf automake autopoint bash bison bzip2 cmake flex gettext git g++ gperf intltool libffi-dev libtool libltdl-dev libssl-dev libxml-parser-perl make openssl patch perl pkg-config python ruby scons sed unzip wget xz-utils -y;
+        sudo apt-get install libtool-bin -y;
+        sudo apt-get install g++-multilib libc6-dev-i386 -y;
+    script: bash src/mxe-build.sh windows64-qt;
 
 deploy:
   provider: releases
   api_key:
-    secure: bH32eYUAT4URcrRZ32boAbLYQ7U9WC2Fh2CDZt57UFFcHPugx0dX5QOdKPJe6tQwIsofOwsRjwrcKypyhALAFRVhxUzsfK+I8y+6+H7GR5rBMD2wA85L67TAIFmmRYnGvjuusRrW2xZLIlyN9k0mHnG+uy2QnnKW/Do5myPxhMbEb9Il7q1eF9YwGprXxd7y/qAXRxDMAqpDIMewviQLU4FONFS7bUzHvgY7wWpTxLK5FCGIsK6SHlc68f1BYRSOdEkVUi6nZ9+8jdrGsmvc55+qritT6qS1GoHSGINJHUb+GdXmxfhAA1TXHSgy84OWHDUnnTCre62VBlA00ZvF4Aih/rQVwfPWzUrO27AjRpJh49lah9FzVwnAoRYr/UyOKDcHXQA6WzzX4BplP4Ymt5art0wEE3e6YpJ3B7JOtOKLJw5WDlIdpBCO16Z3vV8F+Yq5CDhPlJ7Z+FMW/7fmQDWp22RjDGMg7gxwPOV8G6wSgu1Ft4fINIgIblEpiZV1jE19QqwHR0ZinRs1gcXu/UcZmUZL+yvoRJZMRWqBEtguzSoBRE4reo960otSUP2pJaYptAzoPeW1R+cHk4Aoxwb3qBj4vHMOLQFXllC8qvt+4zx9fCO7tX44u7qo56sKej0U3p64FN2F6rp7o+yWZtlZbZaL7shnW4gWoXpEqhE=
+    secure: O8nodqyxLFe1UWuY4MK0ApN69PjoakPfVNihmPOtsqkeVdsRhsm3jEH8JdAzL5tmoGUzyPyGDYws6s4ilGeU981CITsJpfzwhGFvphIOJA2/jg+t+IwJ2t/I2JIe19zQ1LkoOHSQV29uZF0d9Nz2uYHl0S4CQFuEQs6B44thWaFWfabDzv+7tgjsoeaipi2jaUMUt4Cen9KmdXm+sgQBeYA10IIXpZE2H/J0wLjI1ppZCf94Y4MkY5ixXYbi9fKXweGD0pEXnwRXA1IqsLy6nLLHzEElvqnvwhdYhGVCGX4r5wsQCBMRQBRFk9R+HYjNlG2r00t6ULjilHdd3GQUUir9AYRQYHoBMnr5cfE4rwrTV8JuGcoMLkQ+4zdqIkACyS6kc5OPp++TfMGt/z6YQPIWWmt5S3AFTKBwP3g9CRbBrOKFNv86kygln1URtrA8U74BuqHmd9CM/vJz0Yul0jqGCmb0O0Pb/FkFPgJMbdr1UL1IAf3NkPkSe1B/ssrkoZjjGHCQ2hg3GCOcllSL7mPtjt2DT7HvbP2oKR1+1dneObMg0RjfBamOPknZjmVxLGdMQMM5VjAQhlDGGW4I6spAYuIKhfYuzKYV9+gcE/W0poGqZV3n3C32Pwy0ETH0ae4LjJj3h+GxLDpJv+o6u6hp1TgV3/NvHMZul3r52cg=
   file: 
       - Peepcoin-Qt.dmg
+      - Peepcoin-Qt.app
       - peepcoin-qt.tar.gz
+      - peepcoind.tar.gz
       - release/peepcoin-qt-i686.exe
       - release/peepcoin-qt-x86_64.exe
   skip_cleanup: true
   on:
     repo: PXN-Foundation/Peepcoin
     tags: true
-    branch: Temp
+    branch: QA
diff --git a/Peepcoin-qt.pro b/Peepcoin-qt.pro
@@ -1,41 +1,44 @@
 TEMPLATE = app
 TARGET = peepcoin-qt
-VERSION = 1.0.4.0
+VERSION = 1.0.4.1
 INCLUDEPATH += src src/json src/qt
 QT += core gui network printsupport
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE USE_IPV6 BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
-DEFINES += STATIC
-DEFINES += QT_STATIC_BUILD
+#DEFINES += STATIC
+#DEFINES += QT_STATIC_BUILD
 CONFIG += no_include_pwd
 CONFIG += thread
-CONFIG += static
+#CONFIG += static
 QMAKE_CXXFLAGS = -fpermissive
 greaterThan(QT_MAJOR_VERSION, 4) {
     QT += widgets
     DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 }
 
-win32 {
-windows:LIBS += -lshlwapi
-LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
-LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
-windows:LIBS += -lws2_32 -lole32 -loleaut32 -luuid -lgdi32
-LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread_win32-mt
-BOOST_LIB_SUFFIX=-mt
-BOOST_THREAD_LIB_SUFFIX=_win32-mt
-BOOST_INCLUDE_PATH=C:/deps/boost_1_64_0
-BOOST_LIB_PATH=C:/deps/boost_1_64_0/stage/lib
-BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
-BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
-OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2n/include
-OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2n
-MINIUPNPC_INCLUDE_PATH=C:/deps/
-MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
-LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.16
-LIBPNG_LIB_PATH=C:/deps/libpng-1.6.16/.libs
-QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
-QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
-} 
+# win32 {
+# windows:LIBS += -lshlwapi
+# LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
+# LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
+# windows:LIBS += -lws2_32 -lole32 -loleaut32 -luuid -lgdi32
+# LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread_-mt
+#LIBS += -lboost_system-mgw73-mt-s-1_64 -lboost_filesystem-mgw73-mt-s-1_64 -lboost_program_options-mgw73-mt-s-1_64 -lboost_thread-mgw73-mt-s-1_64
+# BOOST_LIB_SUFFIX=-mt
+#BOOST_LIB_SUFFIX=-mgw73-mt-s-1_64
+#BOOST_THREAD_LIB_SUFFIX=_win32-mt
+#BOOST_THREAD_LIB_SUFFIX=-mgw73-mt-s-1_64
+#BOOST_INCLUDE_PATH=C:/deps/boost_1_64_0
+#BOOST_LIB_PATH=C:/deps/boost_1_64_0/stage/lib
+#BDB_INCLUDE_PATH=C:/deps/db-4.8.30.NC/build_unix
+#BDB_LIB_PATH=C:/deps/db-4.8.30.NC/build_unix
+#MINIUPNPC_INCLUDE_PATH=C:/deps
+#MINIUPNPC_LIB_PATH=C:/deps/miniupnpc
+#LIBPNG_INCLUDE_PATH=C:/deps/libpng-1.6.16
+#LIBPNG_LIB_PATH=C:/deps/libpng-1.6.16/.libs
+#QRENCODE_INCLUDE_PATH=C:/deps/qrencode-4.0.2
+#QRENCODE_LIB_PATH=C:/deps/qrencode-4.0.2/.libs
+#OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.2n/include
+#OPENSSL_LIB_PATH=C:/deps/openssl-1.0.2n
+#} 
 # for boost 1.37, add -mt to the boost libraries
 # use: qmake BOOST_LIB_SUFFIX=-mt
 # for boost thread win32 with _win32 sufix
@@ -96,7 +99,7 @@ contains(USE_UPNP, -) {
     count(USE_UPNP, 0) {
         USE_UPNP=1
     }
-    DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
+    DEFINES += USE_UPNP=$$USE_UPNP STATICLIB MINIUPNP_STATICLIB
     INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
     LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
     win32:LIBS += -liphlpapi
@@ -398,7 +401,7 @@ OTHER_FILES += \
 # platform specific defaults, if not overridden on command line
 isEmpty(BOOST_LIB_SUFFIX) {
     macx:BOOST_LIB_SUFFIX = -mt
-    windows:BOOST_LIB_SUFFIX = -mgw49-mt-s-1_57
+    windows:BOOST_LIB_SUFFIX = -mt
 }
 
 isEmpty(BOOST_THREAD_LIB_SUFFIX) {
@@ -501,3 +504,6 @@ contains(RELEASE, 1) {
 }
 
 system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)
+
+DISTFILES += \
+    src/makefile.mingw