Compare commits

...
This repo is archived. You can view files and clone it, but cannot push or open issues/pull-requests.

4 Commits

Author SHA1 Message Date
jwinterm e423a5b40f even more manual changes
4 years ago
jwinterm 1e8ad3ebd7 more manual changes
4 years ago
jwinterm 2a126b5178 manual changes part 2
4 years ago
jwinterm 770d73fd8b hand changes
4 years ago

@ -43,15 +43,19 @@ jobs:
build-windows:
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
steps:
- uses: actions/checkout@v1
- uses: eine/setup-msys2@v0
- uses: eine/setup-msys2@v1
with:
update: true
- name: install monero dependencies
run: msys2do pacman -S --noconfirm mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
- name: build
run: msys2do ./build.sh release
run: |
sed -i 's/CONFIG\ +=\ qtquickcompiler//' wownero-app.pro
./build.sh release
- name: test qml
run: msys2do build/release/bin/wownero-app --test-qml
run: build/release/bin/wownero-app --test-qml

@ -1,2 +1,2 @@
var GUI_VERSION = ""
var GUI_MONERO_VERSION = "v0.8.0.0"
var GUI_MONERO_VERSION = "v0.8.0.0-4-gc3e70dffc"

@ -17,13 +17,18 @@ fi
if [[ "$BUILD_TYPE" == "Release" ]]; then
echo "Release build"
ICU_FILES=(libicudt65.dll libicuin65.dll libicuio65.dll libicutu65.dll libicuuc65.dll)
ICU_FILES=(libicudt67.dll libicuin67.dll libicuio67.dll libicutu67.dll libicuuc67.dll)
else
echo "Debug build"
ICU_FILES=(libicudtd65.dll libicuind65.dll libicuiod65.dll libicutud65.dll libicuucd65.dll)
ICU_FILES=(libicudtd67.dll libicuind67.dll libicuiod67.dll libicutud67.dll libicuucd67.dll)
fi
FILES=(libprotobuf.dll libusb-1.0.dll zlib1.dll libzstd.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll libdouble-conversion.dll)
FILES=(libprotobuf.dll libusb-1.0.dll zlib1.dll libzstd.dll libwinpthread-1.dll
libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll
libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll
libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll
libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll
libdouble-conversion.dll libgcrypt-20.dll libbrotlidec.dll libbrotlicommon.dll)
OPENSSL_FILES=(libssl-1_1 libcrypto-1_1)

@ -1 +1 @@
Subproject commit 1271a7e3a97c0d81816b401627aefb6c6697d0b3
Subproject commit c3e70dffc544e5ad32e676918dfaeeebe046c04b

@ -534,7 +534,7 @@ macx {
}
win32 {
deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -release -no-translations -qmldir=$$PWD
deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -no-translations -qmldir=$$PWD
# Win64 msys2 deploy settings
contains(QMAKE_HOST.arch, x86_64) {
deploy.commands += $$escape_expand(\n\t) $$PWD/windeploy_helper.sh $$DESTDIR