[gimp/wip/Jehan/meson-windows-official: 2/14] build: let's now build the Windows installer with meson.




commit 354b0c22d887789aa97415c2649121ecf3913af1
Author: Jehan <jehan girinstud io>
Date:   Wed Mar 30 19:00:39 2022 +0200

    build: let's now build the Windows installer with meson.
    
    The meson build still has a bunch of issues and build bugs compared to
    the autotools build, nevertheless the last blocker issue was dealt with
    a few days ago (PDB source generation).
    
    Moreover since the meson build on Windows especially makes such dramatic
    difference, in terms of build speed, this is a big improvement for
    Windows contributor's comfort, and as such is one less barrier of entry.
    Anyway I believe that most Windows developers build GIMP with meson now
    so sticking on autotools on this platform is just counter-productive.
    
    This is why it was decided to now make meson the recommended build
    system on Windows, as a further step toward a move to meson. It is still
    not the recommended build system on the other platforms yet.

 build/windows/gitlab-ci/build-gimp-msys2.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index ad8bdf063b..5f5ec18b57 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -6,12 +6,12 @@ if [[ "$MSYSTEM" == "MINGW32" ]]; then
     export ARTIFACTS_SUFFIX="-w32"
     export MSYS2_ARCH="i686"
     export MSYS2_PREFIX="/c/msys64/mingw32"
-    export GIMP_OPTIONS="--with-vala=no --enable-vala=no"
+    export GIMP_OPTIONS="-Dvala-plugins=disabled"
 else
     export ARTIFACTS_SUFFIX="-w64"
     export MSYS2_ARCH="x86_64"
     export MSYS2_PREFIX="/c/msys64/mingw64/"
-    export GIMP_OPTIONS="--enable-windows-installer"
+    export GIMP_OPTIONS="-Dwindows-installer=true"
 fi
 
 export ACLOCAL_FLAGS="-I${MSYS2_PREFIX}/share/aclocal"
@@ -27,6 +27,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-toolchain \
     mingw-w64-$MSYS2_ARCH-autotools \
     mingw-w64-$MSYS2_ARCH-ccache \
+    mingw-w64-$MSYS2_ARCH-meson \
     \
     mingw-w64-$MSYS2_ARCH-aalib \
     mingw-w64-$MSYS2_ARCH-appstream-glib \
@@ -100,13 +101,13 @@ cd "_build${ARTIFACTS_SUFFIX}"
 # and Seed/Webkit are the 2 contenders so far, but they are not
 # available on MSYS2 and we are told it's very hard to build them).
 # TODO: re-enable javascript plug-ins when we can figure this out.
-../autogen.sh --prefix="${GIMP_PREFIX}" \
-              --with-directx-sdk="${MSYS2_PREFIX}" \
-              --with-javascript=no \
-              --with-build-id=org.gimp.GIMP_official \
-              ${GIMP_OPTIONS}
-make -j4
-make install
+meson .. -Dprefix="${GIMP_PREFIX}"           \
+         -Ddirectx-sdk-dir="${MSYS2_PREFIX}" \
+         -Djavascript=false                  \
+         -Dbuild-id=org.gimp.GIMP_official   \
+         ${GIMP_OPTIONS}
+ninja
+ninja install
 cd ..
 
 #ccache --show-stats


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]