[gimp] gitlab-ci, build: --enable-windows-installer also on Linux.



commit b815bca8d3ead3a17ac9b3adaea619943b1810c5
Author: Jehan <jehan girinstud io>
Date:   Thu May 20 02:55:54 2021 +0200

    gitlab-ci, build: --enable-windows-installer also on Linux.
    
    By enabling this option on Linux, not only will the installer language
    file be generated, but the `make check` will also now validate that the
    lang list is consistent with existing gettext files (see commit
    8a42c6ccc2). So it's useful information to know this for instance as
    soon as some translators add a new localization.
    
    Also oppositely remove the option on the MSYS2 native Windows 32-bit
    build. For Windows, we only need this option once, as we use the
    language files generated by the 64-bit build.

 .gitlab-ci.yml                              | 1 +
 build/windows/gitlab-ci/build-gimp-msys2.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a513a8da75..972111d9f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -201,6 +201,7 @@ gimp-distcheck-debian:
         --prefix="${INSTALL_PREFIX}"
         --enable-debug
         --enable-gtk-doc
+        --enable-windows-installer
     - make -j "$(nproc)"
     - make -j "$(nproc)" check
     - make -j "$(nproc)" distcheck
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index 898e590308..e07bb87847 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -11,7 +11,7 @@ else
     export ARTIFACTS_SUFFIX="-w64"
     export MSYS2_ARCH="x86_64"
     export MSYS2_PREFIX="/c/msys64/mingw64/"
-    export GIMP_OPTIONS=""
+    export GIMP_OPTIONS="--enable-windows-installer"
 fi
 
 export ACLOCAL_FLAGS="-I${MSYS2_PREFIX}/share/aclocal"
@@ -102,7 +102,7 @@ ccache --show-stats
 
 mkdir "_build${ARTIFACTS_SUFFIX}"
 cd "_build${ARTIFACTS_SUFFIX}"
-../autogen.sh --prefix="${GIMP_PREFIX}" --enable-windows-installer \
+../autogen.sh --prefix="${GIMP_PREFIX}" \
               --with-directx-sdk="${MSYS2_PREFIX}" \
               ${GIMP_OPTIONS}
 make -j4


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