From cd890f3ae0942a6d65dc874ac00b8e06fccbc661 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Mon, 1 Nov 2021 20:02:58 -0400 Subject: [PATCH 1/5] created doc dir --- DEVELOPING.md => doc/win/DEVELOPING-Ubuntu-18-04.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename DEVELOPING.md => doc/win/DEVELOPING-Ubuntu-18-04.md (97%) diff --git a/DEVELOPING.md b/doc/win/DEVELOPING-Ubuntu-18-04.md similarity index 97% rename from DEVELOPING.md rename to doc/win/DEVELOPING-Ubuntu-18-04.md index b703e66..502d9d8 100644 --- a/DEVELOPING.md +++ b/doc/win/DEVELOPING-Ubuntu-18-04.md @@ -1,5 +1,5 @@ -## Crosscompile for Windows (only tested for Ubuntu 18.04) +## Crosscompile for Windows (only tested for Ubuntu 18.04) by DenioD ``` # build dependencies From 5a6fb909a65492f8de1cdd7d64364ca3e9bcf552 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Mon, 1 Nov 2021 20:24:03 -0400 Subject: [PATCH 2/5] working on getting windows bins --- doc/win/DEVELOPING.md | 118 ++++++++++++++++++++++++++++++ src/scripts/win-mkrelease-only.sh | 90 +++++++++++++++++++++++ 2 files changed, 208 insertions(+) create mode 100644 doc/win/DEVELOPING.md create mode 100755 src/scripts/win-mkrelease-only.sh diff --git a/doc/win/DEVELOPING.md b/doc/win/DEVELOPING.md new file mode 100644 index 0000000..048344a --- /dev/null +++ b/doc/win/DEVELOPING.md @@ -0,0 +1,118 @@ +# Crosscompile for Windows (only tested for Debian Bullseye 11) + +Last updated on October 31, 2021 - happy halloween!!! +We are testing with Qt 5.15.2 and we'll see... + +## build dependencies +``` +sudo apt install -y clang g++ build-essential make mingw-w64 git pkg-config libc6-dev m4 g++-multilib autoconf libncurses-dev libtool-bin unzip python2 python3-zmq zlib1g-dev wget curl bsdmainutils automake libgl1-mesa-dev libglu1-mesa-dev libfontconfig1-dev autopoint libssl-dev + +sudo apt-get install qtbase5-dev qt5-qmake libqt5websockets5-dev qtcreator +``` + +### MXE dependencies + +Below we have the list I tested with, but you can also cross reference the [upstream requirements documentation](https://mxe.cc/#requirements) for the latest list. + +``` +sudo apt install -y bash bison bzip2 flex gettext gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libtool-bin libxml-parser-perl lzip make openssl p7zip-full patch perl pkg-config python ruby sed unzip xz-utils +``` + +### and yet even more dependencies... +``` +apt-get -y update && \ +apt-get install -y libdbus-1-3 libexpat1 \ + libgl1-mesa-dev libglu1-mesa-dev libfontconfig1-dev libssl-dev \ + libfreetype6 libgl1-mesa-glx libglib2.0-0 libx11-6 libx11-xcb1 \ + cmake clang++-6.0 software-properties-common gperf libtool \ + libgdk-pixbuf2.0-dev libltdl-dev + +# needed for QT 5.15.x +sudo apt install -y libxcb-sync-dev libxcb-xinerama0-dev +``` + +## Compile OpenSSL + +QT 5.15.2 has a [known issue list](https://wiki.qt.io/Qt_5.15.2_Known_Issues) +that currently lists that OpenSSL version 1.1.1 be used + +``` +# Download openssl 1.1.1 from https://openssl.org/source/ + +wget https://www.openssl.org/source/openssl-1.1.1.tar.gz +tar zxvpf openssl-1.1.1.tar.gz +cd openssl-1.1.1 +./config +make -j$(nproc) +``` + +### Integrate libsodium for mingw + +Compilation keeps bailing stating that it doesn't have libsodium, so now to set this up... + +``` +wget https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable-mingw.tar.gz +tar zxvpf libsodium-1.0.18-stable-mingw.tar.gz +``` + +This will be the SODIUM_STATIC path further down. + +## Static build of Qt5 + +### Download Qt5 sources +``` +mkdir -p ~/Qt/5.15.2 +cd ~/Qt/5.15.2 + +wget https://download.qt.io/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz +tar xvpf qt-everywhere-src-5.15.2.tar.xz +cd qt-everywhere-src-5.15.2 +``` + +### Configure and build Qt5 statically. +``` +# trying to get libsodium not failing... +## OPENSSL_LIBS='-L/PATH/TO/openssl-1.1.1 -lssl -lcrypto' ./configure -static -prefix ~/Qt/5.15.2/static -skip qtlocation -skip qtmacextras -skip qtpurchasing -skip qtscript -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtdatavis3d -skip qtdoc -skip qtcharts -skip qtdeclarative -skip qt3d -skip qtwebengine -skip qtandroidextras -skip qtwebview -skip qtgamepad -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtwebview -skip qtwebchannel -skip qtwebglplugin -nomake examples -nomake tests -qt-zlib -qt-libpng -feature-fontconfig -no-feature-getentropy -release -openssl-linked -opensource + +OPENSSL_LIBS='-L/PATH/TO/openssl-1.1.1 SODIUM_STATIC=-L/PATH/TO/libsodium-win64/lib -lssl -lcrypto -lsodium' ./configure -static -prefix ~/Qt/5.15.2/static -skip qtlocation -skip qtmacextras -skip qtpurchasing -skip qtscript -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtdatavis3d -skip qtdoc -skip qtcharts -skip qtdeclarative -skip qt3d -skip qtwebengine -skip qtandroidextras -skip qtwebview -skip qtgamepad -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtwebview -skip qtwebchannel -skip qtwebglplugin -nomake examples -nomake tests -qt-zlib -qt-libpng -feature-fontconfig -no-feature-getentropy -release -openssl-linked -opensource + +gmake -j$(nproc) +gmake -j$(nproc) install +``` + +My own Random Notes I came across while figuring this all out for this newer version of QT... +- had error re: -qt-xcb flag and found [this write](https://forum.qt.io/topic/115827/build-on-linux-qt-xcb-option/18) explaining what to add in there +- had error re: -qt-xkbcommon flag and [found this](https://forum.qt.io/post/677389) re "It seems that -qt-xcb option was removed from 5.12.1 onward?" +- now I get [this error](https://github.com/microsoft/vcpkg/issues/15150) +- possible solution to install certain packages, which configure and (g)make now all work when we identify their names on Debian [libxcb-sync-dev libxcb-xinerama0-dev] + +## Build MXE (Cross-compiled Qt5 for Windows in Linux) +``` +mkdir ~/git +cd ~/git +git clone https://github.com/mxe/mxe.git +cd mxe + +make -j$(nproc) MXE_TARGETS=x86_64-w64-mingw32.static qtbase qtwebsockets +``` + +## Build SilentDragonLite .exe +``` +git clone https://git.hush.is/hush/SilentDragonLite +cd SilentDragonLite + +# I'm using rust 1.56.0 from rustup, so not running this command +# if you have newer rustc, then stick with that +curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.49.0 -y + +# if not already in your .bashrc... +echo 'source $HOME/.cargo/env' >> $HOME/.bashrc + +# add win64 to rust +~/.cargo/bin/rustup target add x86_64-pc-windows-gnu +echo "[target.x86_64-pc-windows-gnu]" >> ~/.cargo/config +echo "linker = 'x86_64-w64-mingw32.static-gcc'" >> ~/.cargo/config + +MXE_PATH="/home/your_username/git/mxe/usr/bin" QT_STATIC="/home/your_username/Qt/5.15.2/static" \ +APP_VERSION="1.5.2" PREV_VERSION="1.5.0" ./src/scripts/win-mkrelease-only.sh +``` diff --git a/src/scripts/win-mkrelease-only.sh b/src/scripts/win-mkrelease-only.sh new file mode 100755 index 0000000..1749993 --- /dev/null +++ b/src/scripts/win-mkrelease-only.sh @@ -0,0 +1,90 @@ +#!/bin/bash +# usage: ./src/scripts/mkrelease.sh from root dir +# with QT_STATIC, MXE_PATH, APP_VERSION, PREV_VERSION variables set +if [ -z $QT_STATIC ]; then + echo "QT_STATIC is not set. Please set it to the base directory of a statically compiled Qt"; + exit 1; +fi + +if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi +if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi + +if [ -z $MXE_PATH ]; then + echo "MXE_PATH is not set. Set it to /home/your_username/git/mxe/usr/bin if you want to build Windows with changing your_username" + echo "Not building Windows" + exit 0; +fi + +echo -n "Version files.........." +# Replace the version number in the .pro file so it gets picked up everywhere +sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" silentdragon-lite.pro > /dev/null +# Also update it in the README.md +sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" README.md > /dev/null +echo "[OK]" + +echo -n "Cleaning..............." +rm -rf bin/* +rm -rf artifacts/* +make distclean >/dev/null 2>&1 +echo "[OK]" + +echo "" +echo "[Building on" `lsb_release -r`"]" + +echo -n "Configuring............" +QT_STATIC=$QT_STATIC bash src/scripts/dotranslations.sh >/dev/null +$QT_STATIC/bin/qmake silentdragon-lite.pro -spec linux-clang CONFIG+=release > /dev/null +rm -rf bin/SilentDragonLite* > /dev/null +echo "[OK]" + +echo "" +echo "[Windows]" +mkdir release +export PATH=$MXE_PATH:$PATH + +echo -n "Configuring............" +make clean > /dev/null +rm -f SilentDragonLite-mingw.pro +rm -rf release/ +mkdir release +cp src/precompiled.h release/ +#Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file +cat silentdragon-lite.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > SilentDragonLite-mingw.pro +echo "[OK]" + +echo -n "Building..............." +cp src/precompiled.h release/ +# Build the lib first +cd lib && make winrelease && cd .. +cp src/precompiled.h release/ +# figure how to lupdate & lrelease with qt... here... +#x86_64-w64-mingw32.static-qmake-qt5 silentdragon-lite.pro CONFIG+=release > /dev/null +x86_64-w64-mingw32.static-qmake-qt5 SilentDragonLite-mingw.pro CONFIG+=release > /dev/null +cp src/precompiled.h release/ +make -j32 > /dev/null +echo "[OK]" + +echo -n "Packaging.............." +mkdir release/SilentDragonLite-v$APP_VERSION +cp release/SilentDragonLite.exe release/SilentDragonLite-v$APP_VERSION +cp README.md release/SilentDragonLite-v$APP_VERSION +cp LICENSE release/SilentDragonLite-v$APP_VERSION +cd release && zip -r Windows-binaries-SilentDragonLite-v$APP_VERSION.zip SilentDragonLite-v$APP_VERSION/ > /dev/null +cd .. + +mkdir artifacts >/dev/null 2>&1 +cp release/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip ./artifacts/ +echo "[OK]" + +if [ -f artifacts/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip ] ; then + echo -n "Package contents......." + if unzip -l "artifacts/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip" | wc -l | grep -q "9"; then + echo "[OK]" + else + echo "[ERROR]" + exit 1 + fi +else + echo "[ERROR]" + exit 1 +fi From 25a6d289ab653a7f3d77ce520ed43059eec3650d Mon Sep 17 00:00:00 2001 From: jahway603 Date: Sun, 19 Dec 2021 20:54:25 -0500 Subject: [PATCH 3/5] cleanup of README.md between the diffs in dev and master branch --- README.md | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 5c620ca..0e5d0f9 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,5 @@ # SilentDragonLite -

- - MyHushTeam's Twitter - - follow on Twitter - - follow on Mastodon -

- SilentDragonLite is a lightwallet for HUSH ($HUSH) runs on Linux and Windows which does not require you to download the full blockchain. This is experimental software under active development! ![HushChat screenshot](hushchat-screenshot.png) @@ -46,9 +34,10 @@ Go to the [releases page](https://git.hush.is/hush/SilentDragonLite/releases) an #### Building on Linux -**Nothing below will work without rust. Check that your system has rustc 1.49. If not then you need to use [Rustup in Linux](https://rustup.rs/).** +**Nothing below will work without rust. Check that your system has rustc 1.49. If not then you need to use [Rustup in Linux](https://rustup.rs/).** + +An example of how to install Rust 1.49 with rustup is below: -##### Install Rust & Change Version ``` curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh Choose: 1) Proceed with installation (default) @@ -56,7 +45,9 @@ source $HOME/.cargo/env rustup install 1.49 rustup default 1.49 rustup -V -``` +``` + +**Nothing below will work without the Linux "build-essential" package. Check that your system has it installed. If not, and you're using a Ubuntu/Debian distro, then you can install with `apt install build-essential`.** Compiling can take some time, so be patient and wait for it to finish. It will take potentially a long time for slower systems. Be Patient and please report compiler problems! @@ -94,9 +85,15 @@ SilentDragonLite does automatic note and utxo management, which means it doesn't * Will automatically shield your transparent funds at the first opportunity * When sending an outgoing transaction to a shielded address, SilentDragonLite can decide to use the transaction to additionally shield your transparent funds (i.e., send your transparent funds to your own shielded address in the same transaction) +## Where is my wallet stored? + +Linux: `~/.silentdragonlite` + +Windows 10: `C:\Users\%user\AppData\Roaming\silentdragonlite` + ## Support -For support join us on [Telegram Support](https://hush.is/telegram_support), or our [Main Telegram](https://hush.is/telegram) or tweet at [@MyHushTeam](https://twitter.com/MyHushTeam), or toot at our [Mastodon](https://fosstodon.org/@myhushteam), or [file an issue](https://git.hush.is/hush/SilentDragonLite/issues). +For support join us on [Telegram Support](https://hush.is/telegram_support), or our [Main Telegram](https://hush.is/telegram), or toot at our [Mastodon](https://fosstodon.org/@myhushteam), or [file an issue](https://git.hush.is/hush/SilentDragonLite/issues). You can also subscribe to our channels on [PeerTube](https://videos.hush.is), on [YouTube](https://hush.is/yt), or on [Odyssee/LBRY](https://odysee.com/@MyHushTeam:3). From 68eefa1b0e888ff6b5eb614c3388cca9cfbaf75c Mon Sep 17 00:00:00 2001 From: jahway603 Date: Sun, 19 Dec 2021 21:22:00 -0500 Subject: [PATCH 4/5] removed unneeded files --- doc/win/DEVELOPING.md | 118 ------------------------------ src/scripts/win-mkrelease-only.sh | 90 ----------------------- 2 files changed, 208 deletions(-) delete mode 100644 doc/win/DEVELOPING.md delete mode 100755 src/scripts/win-mkrelease-only.sh diff --git a/doc/win/DEVELOPING.md b/doc/win/DEVELOPING.md deleted file mode 100644 index 048344a..0000000 --- a/doc/win/DEVELOPING.md +++ /dev/null @@ -1,118 +0,0 @@ -# Crosscompile for Windows (only tested for Debian Bullseye 11) - -Last updated on October 31, 2021 - happy halloween!!! -We are testing with Qt 5.15.2 and we'll see... - -## build dependencies -``` -sudo apt install -y clang g++ build-essential make mingw-w64 git pkg-config libc6-dev m4 g++-multilib autoconf libncurses-dev libtool-bin unzip python2 python3-zmq zlib1g-dev wget curl bsdmainutils automake libgl1-mesa-dev libglu1-mesa-dev libfontconfig1-dev autopoint libssl-dev - -sudo apt-get install qtbase5-dev qt5-qmake libqt5websockets5-dev qtcreator -``` - -### MXE dependencies - -Below we have the list I tested with, but you can also cross reference the [upstream requirements documentation](https://mxe.cc/#requirements) for the latest list. - -``` -sudo apt install -y bash bison bzip2 flex gettext gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libtool-bin libxml-parser-perl lzip make openssl p7zip-full patch perl pkg-config python ruby sed unzip xz-utils -``` - -### and yet even more dependencies... -``` -apt-get -y update && \ -apt-get install -y libdbus-1-3 libexpat1 \ - libgl1-mesa-dev libglu1-mesa-dev libfontconfig1-dev libssl-dev \ - libfreetype6 libgl1-mesa-glx libglib2.0-0 libx11-6 libx11-xcb1 \ - cmake clang++-6.0 software-properties-common gperf libtool \ - libgdk-pixbuf2.0-dev libltdl-dev - -# needed for QT 5.15.x -sudo apt install -y libxcb-sync-dev libxcb-xinerama0-dev -``` - -## Compile OpenSSL - -QT 5.15.2 has a [known issue list](https://wiki.qt.io/Qt_5.15.2_Known_Issues) -that currently lists that OpenSSL version 1.1.1 be used - -``` -# Download openssl 1.1.1 from https://openssl.org/source/ - -wget https://www.openssl.org/source/openssl-1.1.1.tar.gz -tar zxvpf openssl-1.1.1.tar.gz -cd openssl-1.1.1 -./config -make -j$(nproc) -``` - -### Integrate libsodium for mingw - -Compilation keeps bailing stating that it doesn't have libsodium, so now to set this up... - -``` -wget https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable-mingw.tar.gz -tar zxvpf libsodium-1.0.18-stable-mingw.tar.gz -``` - -This will be the SODIUM_STATIC path further down. - -## Static build of Qt5 - -### Download Qt5 sources -``` -mkdir -p ~/Qt/5.15.2 -cd ~/Qt/5.15.2 - -wget https://download.qt.io/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz -tar xvpf qt-everywhere-src-5.15.2.tar.xz -cd qt-everywhere-src-5.15.2 -``` - -### Configure and build Qt5 statically. -``` -# trying to get libsodium not failing... -## OPENSSL_LIBS='-L/PATH/TO/openssl-1.1.1 -lssl -lcrypto' ./configure -static -prefix ~/Qt/5.15.2/static -skip qtlocation -skip qtmacextras -skip qtpurchasing -skip qtscript -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtdatavis3d -skip qtdoc -skip qtcharts -skip qtdeclarative -skip qt3d -skip qtwebengine -skip qtandroidextras -skip qtwebview -skip qtgamepad -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtwebview -skip qtwebchannel -skip qtwebglplugin -nomake examples -nomake tests -qt-zlib -qt-libpng -feature-fontconfig -no-feature-getentropy -release -openssl-linked -opensource - -OPENSSL_LIBS='-L/PATH/TO/openssl-1.1.1 SODIUM_STATIC=-L/PATH/TO/libsodium-win64/lib -lssl -lcrypto -lsodium' ./configure -static -prefix ~/Qt/5.15.2/static -skip qtlocation -skip qtmacextras -skip qtpurchasing -skip qtscript -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtdatavis3d -skip qtdoc -skip qtcharts -skip qtdeclarative -skip qt3d -skip qtwebengine -skip qtandroidextras -skip qtwebview -skip qtgamepad -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtwebview -skip qtwebchannel -skip qtwebglplugin -nomake examples -nomake tests -qt-zlib -qt-libpng -feature-fontconfig -no-feature-getentropy -release -openssl-linked -opensource - -gmake -j$(nproc) -gmake -j$(nproc) install -``` - -My own Random Notes I came across while figuring this all out for this newer version of QT... -- had error re: -qt-xcb flag and found [this write](https://forum.qt.io/topic/115827/build-on-linux-qt-xcb-option/18) explaining what to add in there -- had error re: -qt-xkbcommon flag and [found this](https://forum.qt.io/post/677389) re "It seems that -qt-xcb option was removed from 5.12.1 onward?" -- now I get [this error](https://github.com/microsoft/vcpkg/issues/15150) -- possible solution to install certain packages, which configure and (g)make now all work when we identify their names on Debian [libxcb-sync-dev libxcb-xinerama0-dev] - -## Build MXE (Cross-compiled Qt5 for Windows in Linux) -``` -mkdir ~/git -cd ~/git -git clone https://github.com/mxe/mxe.git -cd mxe - -make -j$(nproc) MXE_TARGETS=x86_64-w64-mingw32.static qtbase qtwebsockets -``` - -## Build SilentDragonLite .exe -``` -git clone https://git.hush.is/hush/SilentDragonLite -cd SilentDragonLite - -# I'm using rust 1.56.0 from rustup, so not running this command -# if you have newer rustc, then stick with that -curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.49.0 -y - -# if not already in your .bashrc... -echo 'source $HOME/.cargo/env' >> $HOME/.bashrc - -# add win64 to rust -~/.cargo/bin/rustup target add x86_64-pc-windows-gnu -echo "[target.x86_64-pc-windows-gnu]" >> ~/.cargo/config -echo "linker = 'x86_64-w64-mingw32.static-gcc'" >> ~/.cargo/config - -MXE_PATH="/home/your_username/git/mxe/usr/bin" QT_STATIC="/home/your_username/Qt/5.15.2/static" \ -APP_VERSION="1.5.2" PREV_VERSION="1.5.0" ./src/scripts/win-mkrelease-only.sh -``` diff --git a/src/scripts/win-mkrelease-only.sh b/src/scripts/win-mkrelease-only.sh deleted file mode 100755 index 1749993..0000000 --- a/src/scripts/win-mkrelease-only.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -# usage: ./src/scripts/mkrelease.sh from root dir -# with QT_STATIC, MXE_PATH, APP_VERSION, PREV_VERSION variables set -if [ -z $QT_STATIC ]; then - echo "QT_STATIC is not set. Please set it to the base directory of a statically compiled Qt"; - exit 1; -fi - -if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi -if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi - -if [ -z $MXE_PATH ]; then - echo "MXE_PATH is not set. Set it to /home/your_username/git/mxe/usr/bin if you want to build Windows with changing your_username" - echo "Not building Windows" - exit 0; -fi - -echo -n "Version files.........." -# Replace the version number in the .pro file so it gets picked up everywhere -sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" silentdragon-lite.pro > /dev/null -# Also update it in the README.md -sed -i "s/${PREV_VERSION}/${APP_VERSION}/g" README.md > /dev/null -echo "[OK]" - -echo -n "Cleaning..............." -rm -rf bin/* -rm -rf artifacts/* -make distclean >/dev/null 2>&1 -echo "[OK]" - -echo "" -echo "[Building on" `lsb_release -r`"]" - -echo -n "Configuring............" -QT_STATIC=$QT_STATIC bash src/scripts/dotranslations.sh >/dev/null -$QT_STATIC/bin/qmake silentdragon-lite.pro -spec linux-clang CONFIG+=release > /dev/null -rm -rf bin/SilentDragonLite* > /dev/null -echo "[OK]" - -echo "" -echo "[Windows]" -mkdir release -export PATH=$MXE_PATH:$PATH - -echo -n "Configuring............" -make clean > /dev/null -rm -f SilentDragonLite-mingw.pro -rm -rf release/ -mkdir release -cp src/precompiled.h release/ -#Mingw seems to have trouble with precompiled headers, so strip that option from the .pro file -cat silentdragon-lite.pro | sed "s/precompile_header/release/g" | sed "s/PRECOMPILED_HEADER.*//g" > SilentDragonLite-mingw.pro -echo "[OK]" - -echo -n "Building..............." -cp src/precompiled.h release/ -# Build the lib first -cd lib && make winrelease && cd .. -cp src/precompiled.h release/ -# figure how to lupdate & lrelease with qt... here... -#x86_64-w64-mingw32.static-qmake-qt5 silentdragon-lite.pro CONFIG+=release > /dev/null -x86_64-w64-mingw32.static-qmake-qt5 SilentDragonLite-mingw.pro CONFIG+=release > /dev/null -cp src/precompiled.h release/ -make -j32 > /dev/null -echo "[OK]" - -echo -n "Packaging.............." -mkdir release/SilentDragonLite-v$APP_VERSION -cp release/SilentDragonLite.exe release/SilentDragonLite-v$APP_VERSION -cp README.md release/SilentDragonLite-v$APP_VERSION -cp LICENSE release/SilentDragonLite-v$APP_VERSION -cd release && zip -r Windows-binaries-SilentDragonLite-v$APP_VERSION.zip SilentDragonLite-v$APP_VERSION/ > /dev/null -cd .. - -mkdir artifacts >/dev/null 2>&1 -cp release/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip ./artifacts/ -echo "[OK]" - -if [ -f artifacts/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip ] ; then - echo -n "Package contents......." - if unzip -l "artifacts/Windows-binaries-SilentDragonLite-v$APP_VERSION.zip" | wc -l | grep -q "9"; then - echo "[OK]" - else - echo "[ERROR]" - exit 1 - fi -else - echo "[ERROR]" - exit 1 -fi From 8a5c8e4898aac993736a150f77c880a3b6c153f8 Mon Sep 17 00:00:00 2001 From: jahway603 Date: Sat, 12 Feb 2022 02:37:06 -0500 Subject: [PATCH 5/5] fixed port of poop SDL server --- src/mainwindow.cpp | 2 +- src/settings.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index de6b588..ade4ca2 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -841,7 +841,7 @@ void MainWindow::setupSettingsModal() { settings.cmbServer->addItem("https://lite.hush.land"); settings.cmbServer->addItem("https://devo.crabdance.com"); settings.cmbServer->addItem("https://lite.nyami.org"); - settings.cmbServer->addItem("https://poop.granitefone.me:9067"); + settings.cmbServer->addItem("https://poop.granitefone.me"); settings.cmbServer->addItem("https://lite.hushpool.is"); //settings.cmbServer->addItem("https://hush.leto.net:5420"); diff --git a/src/settings.cpp b/src/settings.cpp index bddd737..72c901c 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -297,7 +297,7 @@ QString Settings::getRandomServer() { "https://lite.hush.is", "https://devo.crabdance.com", "https://lite.nyami.org", - "https://poop.granitefone.me:9067", + "https://poop.granitefone.me", // These can be un-commented to test out how code deals with down servers //"https://thisisdown1.example.com", //"https://thisisdown2.example.com",