build/windows: Extend unified list to Deps scripts

The list contains, in addition to the GIMP deps, all babl and GEGL deps.
So, let's use it.
Also, nothing new under the sun. We already use a unique list on the
Windows build instruction page (for stable branch) and do the same to
Debian image job.

build/windows/gitlab-ci/1_build-deps-crossroad.sh

@@ -5,12 +5,18 @@ else # [[ "x$CROSSROAD_PLATFORM" = "xw32" ]];
 fi
 
 
-# Install the required (pre-built) packages for babl and GEGL
+# Install the required (pre-built) packages for babl, GEGL and GIMP
 crossroad source msys2
-crossroad install cairo     \
+export DEPS_PATH="build/windows/gitlab-ci/all-deps-uni.txt"
-                  graphviz  \
+sed -i "s/DEPS_ARCH_//g" $DEPS_PATH
-                  json-glib \
+export GIMP_DEPS=`cat $DEPS_PATH`
-                  lcms2
+crossroad install $GIMP_DEPS
+
+if [ $? -ne 0 ]; then
+  echo "Installation of pre-built dependencies failed.";
+  exit 1;
+fi
+
 
 # Clone babl and GEGL (follow master branch)
 mkdir _deps && cd _deps
@@ -31,17 +37,6 @@ ninja && ninja install
 cd ../../
 
 
-# Install the required (pre-built) packages for GIMP
-export DEPS_PATH="../build/windows/gitlab-ci/all-deps-uni.txt"
-sed -i "s/DEPS_ARCH_//g" $DEPS_PATH
-export GIMP_DEPS=`cat $DEPS_PATH`
-crossroad install libmng $GIMP_DEPS
-
-if [ $? -ne 0 ]; then
-  echo "Installation of pre-built dependencies failed.";
-  exit 1;
-fi
-
 # Build (part of) GIMP
 if [ "x$CROSSROAD_PLATFORM" = "xw64" ]; then
   ## Generator of the gio 'giomodule.cache' to fix error about

build/windows/gitlab-ci/1_build-deps-msys2.sh

@@ -14,31 +14,31 @@ fi
 
 if [[ "$BUILD_TYPE" != "CI_NATIVE" ]]; then
   # Make the script callable from every directory
-    cd ~
+  if [[ "$0" != "build/windows/gitlab-ci/1_build-deps-msys2.sh" ]]; then
+    GIMP_EXTDIR="$0"
+    GIMP_EXTDIR=$(sed 's|build/windows/gitlab-ci/1_build-deps-msys2.sh||g' <<< $GIMP_EXTDIR)
+    GIMP_DIR="$GIMP_EXTDIR"
+  else
+    GIMP_GITDIR="$(pwd)"
+    GIMP_GITDIR=$(sed 's|build/windows/gitlab-ci||g' <<< $GIMP_GITDIR)
+    GIMP_GITDIR=$(sed 's|build/windows||g' <<< $GIMP_GITDIR)
+    GIMP_GITDIR=$(sed 's|build||g' <<< $GIMP_GITDIR)
+    GIMP_DIR="$GIMP_GITDIR"
+  fi
+  cd $GIMP_DIR
 
   pacman --noconfirm -Suy
 fi
 
 
 # Install the required (pre-built) packages for babl and GEGL
-pacman --noconfirm -S --needed \
+export DEPS_PATH="build/windows/gitlab-ci/all-deps-uni.txt"
+sed -i "s/DEPS_ARCH_/${MINGW_PACKAGE_PREFIX}-/g" $DEPS_PATH
+export GIMP_DEPS=`cat $DEPS_PATH`
+pacman --noconfirm -S --needed git                                \
                                base-devel                         \
                                ${MINGW_PACKAGE_PREFIX}-toolchain  \
-    ${MINGW_PACKAGE_PREFIX}-meson \
+                               $GIMP_DEPS
-    \
-    ${MINGW_PACKAGE_PREFIX}-cairo \
-    ${MINGW_PACKAGE_PREFIX}-crt-git \
-    ${MINGW_PACKAGE_PREFIX}-glib-networking \
-    ${MINGW_PACKAGE_PREFIX}-gobject-introspection \
-    ${MINGW_PACKAGE_PREFIX}-json-glib \
-    ${MINGW_PACKAGE_PREFIX}-lcms2 \
-    ${MINGW_PACKAGE_PREFIX}-lensfun \
-    ${MINGW_PACKAGE_PREFIX}-libspiro \
-    ${MINGW_PACKAGE_PREFIX}-maxflow \
-    ${MINGW_PACKAGE_PREFIX}-openexr \
-    ${MINGW_PACKAGE_PREFIX}-pango \
-    ${MINGW_PACKAGE_PREFIX}-suitesparse \
-    ${MINGW_PACKAGE_PREFIX}-vala
 
 
 # Clone babl and GEGL (follow master branch)
@@ -63,7 +63,8 @@ clone_or_pull gegl
 
 
 # Build babl and GEGL
-configure_or_build() {
+configure_or_build()
+  {
     if [ ! -f "_${1}/_build/build.ninja" ]; then
       mkdir -p _${1}/_build${ARTIFACTS_SUFFIX} && cd _${1}/_build${ARTIFACTS_SUFFIX}
       meson setup .. -Dprefix="${GIMP_PREFIX}" \
@@ -75,10 +76,17 @@ configure_or_build() {
       ninja && ninja install
       cd ../..
     fi
-}
+  }
 
 configure_or_build babl "-Dwith-docs=false"
 
 configure_or_build gegl "-Ddocs=false \
                          -Dcairo=enabled -Dumfpack=enabled \
                          -Dopenexr=enabled -Dworkshop=true"
+
+
+if [[ "$BUILD_TYPE" != "CI_NATIVE" ]]; then
+  mv _babl ~
+  mv _gegl ~
+  mv "${GIMP_PREFIX}" ~
+fi

build/windows/gitlab-ci/2_build-gimp-msys2.sh

@@ -43,7 +43,9 @@ fi
 export DEPS_PATH="build/windows/gitlab-ci/all-deps-uni.txt"
 sed -i "s/DEPS_ARCH_/${MINGW_PACKAGE_PREFIX}-/g" $DEPS_PATH
 export GIMP_DEPS=`cat $DEPS_PATH`
-pacman --noconfirm -S --needed base-devel $GIMP_DEPS
+pacman --noconfirm -S --needed base-devel                         \
+                               ${MINGW_PACKAGE_PREFIX}-toolchain  \
+                               $GIMP_DEPS
 
 # Install QOI header manually
 # mingw32 package of qoi was removed from MSYS2, we have download it by ourselves

build/windows/gitlab-ci/3_package-gimp-uni_base.sh

@@ -28,7 +28,9 @@ if [[ "$BUILD_TYPE" != "CI_CROSS" ]]; then
 export DEPS_PATH="build/windows/gitlab-ci/all-deps-uni.txt"
 sed -i "s/DEPS_ARCH_/${MINGW_PACKAGE_PREFIX}-/g" $DEPS_PATH
 export GIMP_DEPS=`cat $DEPS_PATH`
-pacman --noconfirm -S --needed base-devel $GIMP_DEPS
+pacman --noconfirm -S --needed base-devel                         \
+                               ${MINGW_PACKAGE_PREFIX}-toolchain  \
+                               $GIMP_DEPS
 fi
 
 

build/windows/gitlab-ci/all-deps-uni.txt

@@ -28,6 +28,7 @@ DEPS_ARCH_libheif
 DEPS_ARCH_libiff
 DEPS_ARCH_libilbm
 DEPS_ARCH_libjxl
+DEPS_ARCH_libmng
 DEPS_ARCH_libmypaint
 DEPS_ARCH_libspiro
 DEPS_ARCH_libwebp