From 788d13dfb3eee7ab8e48db0854b08232a5d82808 Mon Sep 17 00:00:00 2001 From: Zachary Date: Fri, 26 Aug 2022 22:28:19 +0000 Subject: [PATCH] These commits were implemented to preserve artifacts from the Windows build and produce a .zip in an attempt to produce a portable install Update build-mingw.sh Update build-mingw.sh Update build-mingw.sh Update build-mingw.sh Update build-mingw.sh Update build-mingw.sh Update build-mingw.sh Update .gitlab-ci.yml Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++++ build-aux/win32/build-mingw.sh | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ded1c9..4283aa6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,6 +89,12 @@ msys2-mingw64: $env:CHERE_INVOKING = 'yes' #preserve cwd $env:MSYSTEM = 'MINGW64' C:/msys64/usr/bin/bash -lc "./build-aux/win32/build-mingw.sh" + artifacts: + paths: + #preserve entire builddir directory so you can see the exe + #in the src directory and try to execute as well as the created + #zip in the builddir directory + - builddir #macos: diff --git a/build-aux/win32/build-mingw.sh b/build-aux/win32/build-mingw.sh index 38d2591..661e167 100644 --- a/build-aux/win32/build-mingw.sh +++ b/build-aux/win32/build-mingw.sh @@ -12,11 +12,18 @@ pacman -S --noconfirm mingw-w64-x86_64-pkg-config \ mingw-w64-x86_64-libssp \ mingw-w64-x86_64-gcc \ base-devel \ - mingw-w64-x86_64-toolchain + mingw-w64-x86_64-toolchain \ + zip pacman -Syu --noconfirm # Compile the application LDFLAGS="-Wl,-lssp" meson setup builddir -Dforce_fallback_for=libadwaita,glib,gtk4,gtksourceview -Dlibadwaita:vapi=false -Dgtksourceview:vapi=false -Dgtk4:media-gstreamer=disabled meson compile -C builddir meson test -C builddir --suite gnome-text-editor -meson install -C builddir + +#install to a single dir to make it easy to zip + +cd builddir +mkdir filesdir +DESTDIR=./filesdir meson install +zip -r portable.zip ./filesdir -- GitLab