[gimp/wip/Jehan/gitlab-ci-win-32-bit: 12/23] build: test! Do not merge yet!

From: Jehan <jehanp src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp/wip/Jehan/gitlab-ci-win-32-bit: 12/23] build: test! Do not merge yet!
Date: Wed, 12 May 2021 20:05:14 +0000 (UTC)

commit af8c64aba77e8cb2ac4b841a9f3e27366158331a
Author: Jehan <jehan girinstud io>
Date:   Mon May 10 21:50:49 2021 +0200

    build: test! Do not merge yet!

 .gitlab-ci.yml                                  | 52 +++++++------------------
 build/windows/gitlab-ci/build-deps-msys2.sh     |  4 +-
 build/windows/gitlab-ci/build-gimp-msys2.sh     | 10 +++--
 build/windows/gitlab-ci/installer-gimp-msys2.sh | 23 +++++++++++
 build/windows/gitlab-ci/package-gimp-msys2.sh   |  4 +-
 build/windows/installer/gimp3264.iss            |  4 +-
 6 files changed, 52 insertions(+), 45 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78b194db07..ec3343ee63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,9 +205,6 @@ deps-win64-native:
     CHERE_INVOKING: "yes"
   tags:
     - win32-ps
-  cache:
-    paths:
-    - _install/
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-deps-msys2.sh"
@@ -216,7 +213,7 @@ deps-win64-native:
     when: always
     expire_in: 2 hours
     paths:
-      - _install
+      - _install-w64
   needs: []
 
 gimp-win64-native:
@@ -236,8 +233,8 @@ gimp-win64-native:
     when: always
     expire_in: 1 day
     paths:
-    - _install
-    - _build
+    - _install-w64
+    - _build-w64
   cache:
     paths:
     - _ccache/
@@ -254,9 +251,6 @@ deps-win32-native:
     CHERE_INVOKING: "yes"
   tags:
     - win32-ps
-  cache:
-    paths:
-    - _install/
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-deps-msys2.sh"
@@ -265,7 +259,7 @@ deps-win32-native:
     when: always
     expire_in: 2 hours
     paths:
-      - _install
+      - _install-w32
   needs: []
 
 gimp-win32-native:
@@ -285,8 +279,8 @@ gimp-win32-native:
     when: always
     expire_in: 1 day
     paths:
-    - _install
-    - _build
+    - _install-w32
+    - _build-w32
   cache:
     paths:
     - _ccache/
@@ -443,49 +437,33 @@ cppcheck:
 
 ## Ready-to-distribute ##
 
-win64-native-nightly:
+win-installer-nightly:
   rules:
     - if: '$CI_COMMIT_TAG == null && $CI_PIPELINE_SOURCE != "schedule"'
   variables:
-    MSYSTEM: "MINGW64"
     CHERE_INVOKING: "yes"
   tags:
     - win32-ps
   stage: distribution
   dependencies:
     - gimp-win64-native
-  artifacts:
-    name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
-    when: always
-    expire_in: 2 days
-    paths:
-    - gimp-w64
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
-  needs: ["gimp-win64-native"]
-
-win32-native-nightly:
-  rules:
-    - if: '$CI_COMMIT_TAG == null && $CI_PIPELINE_SOURCE != "schedule"'
-  variables:
-    MSYSTEM: "MINGW32"
-    CHERE_INVOKING: "yes"
-  tags:
-    - win32-ps
-  stage: distribution
-  dependencies:
     - gimp-win32-native
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
     when: always
     expire_in: 2 days
     paths:
-    - gimp-w32
+    - build/windows/installer/_Output
+    #- gimp-w64
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
+    - set MSYSTEM=MINGW64
+    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
+    - set MSYSTEM=MINGW32
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
-  needs: ["gimp-win32-native"]
+    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/installer-gimp-msys2.sh"
+
+  needs: ["gimp-win32-native", "gimp-win64-native"]
 
 sources:
   except:
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index a7f667ae3b..d9470b1159 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -3,12 +3,14 @@
 set -e
 
 if [[ "$MSYSTEM" == "MINGW32" ]]; then
+    export ARTIFACTS_SUFFIX="-w32"
     export MSYS2_ARCH="i686"
     # vapi build fails on 32-bit, with no error output. Let's just drop
     # it for this architecture.
     export BABL_OPTIONS="-Denable-vapi=false"
     export GEGL_OPTIONS="-Dvapigen=disabled"
 else
+    export ARTIFACTS_SUFFIX="-w64"
     export MSYS2_ARCH="x86_64"
     export BABL_OPTIONS=""
     export GEGL_OPTIONS=""
@@ -52,7 +54,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-vala
 
 export GIT_DEPTH=1
-export GIMP_PREFIX=`realpath ./_install`
+export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}"
 export PATH="$GIMP_PREFIX/bin:$PATH"
 export PKG_CONFIG_PATH="${GIMP_PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH"
 export PKG_CONFIG_PATH="${GIMP_PREFIX}/share/pkgconfig:$PKG_CONFIG_PATH"
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index d22678ae40..42ae685b08 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -3,11 +3,13 @@
 set -e
 
 if [[ "$MSYSTEM" == "MINGW32" ]]; then
+    export ARTIFACTS_SUFFIX="-w32"
     export MSYS2_ARCH="i686"
     export ACLOCAL_FLAGS="-I/c/msys64/mingw32/share/aclocal"
     export PATH="/c/msys64/mingw32/bin:$PATH"
     export GIMP_OPTIONS="--with-vala=no --enable-vala=no"
 else
+    export ARTIFACTS_SUFFIX="-w64"
     export MSYS2_ARCH="x86_64"
     export ACLOCAL_FLAGS="-I/c/msys64/mingw64/share/aclocal"
     export PATH="/c/msys64/mingw64/bin:$PATH"
@@ -78,9 +80,9 @@ pacman --noconfirm -S --needed \
 # XXX We've got a weird error when the prefix is in the current dir.
 # Until we figure it out, this trick seems to work, even though it's
 # completely ridiculous.
-mv _install ~
+mv "_install${ARTIFACTS_SUFFIX}" ~
 
-export GIMP_PREFIX=`realpath ~/_install`
+export GIMP_PREFIX="`realpath ~/_install`${ARTIFACTS_SUFFIX}"
 export PATH="$GIMP_PREFIX/bin:$PATH"
 export PKG_CONFIG_PATH="${GIMP_PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH"
 export PKG_CONFIG_PATH="${GIMP_PREFIX}/share/pkgconfig:$PKG_CONFIG_PATH"
@@ -96,8 +98,8 @@ export CC="ccache gcc"
 ccache --zero-stats
 ccache --show-stats
 
-mkdir _build
-cd _build
+mkdir "_build${ARTIFACTS_SUFFIX}"
+cd "_build${ARTIFACTS_SUFFIX}"
 ../autogen.sh --prefix="${GIMP_PREFIX}" --enable-windows-installer ${GIMP_OPTIONS}
 make -j4
 make install
diff --git a/build/windows/gitlab-ci/installer-gimp-msys2.sh b/build/windows/gitlab-ci/installer-gimp-msys2.sh
new file mode 100644
index 0000000000..6d9663a53e
--- /dev/null
+++ b/build/windows/gitlab-ci/installer-gimp-msys2.sh
@@ -0,0 +1,23 @@
+wget https://jrsoftware.org/download.php/is.exe
+./is.exe //VERYSILENT //SUPPRESSMSGBOXES //ALLUSERS
+ls "/c/Program Files (x86)/Inno Setup 6/Languages"
+mkdir "/c/Program Files (x86)/Inno Setup 6/Languages/Unofficial"
+cd "/c/Program Files (x86)/Inno Setup 6/Languages/Unofficial"
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Basque.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseSimplified.isl
+wget 
https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/ChineseTraditional.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/EnglishBritish.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Esperanto.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Greek.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Hungarian.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Indonesian.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Korean.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Latvian.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Malaysian.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Marathi.islu
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Romanian.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Swedish.isl
+wget https://raw.githubusercontent.com/jrsoftware/issrc/main/Files/Languages/Unofficial/Vietnamese.isl
+cd -
+cd build/windows/installer
+./compile.bat 2.99.6 ../../.. gimp-w32 gimp-w64 ../../.. gimp-w32 gimp-w64
diff --git a/build/windows/gitlab-ci/package-gimp-msys2.sh b/build/windows/gitlab-ci/package-gimp-msys2.sh
index 11d5c43161..7f11c30913 100644
--- a/build/windows/gitlab-ci/package-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/package-gimp-msys2.sh
@@ -3,11 +3,13 @@
 set -e
 
 if [[ "$MSYSTEM" == "MINGW32" ]]; then
+    export ARTIFACTS_SUFFIX="-w32"
     export MSYS2_ARCH="i686"
     export MSYS_PREFIX="/c/msys64/mingw32/"
     export PATH="/mingw32/bin:$PATH"
     export GIMP_DISTRIB=`realpath ./gimp-w32`
 else
+    export ARTIFACTS_SUFFIX="-w64"
     export MSYS2_ARCH="x86_64"
     export MSYS_PREFIX="/c/msys64/mingw64/"
     export PATH="/mingw64/bin:$PATH"
@@ -76,7 +78,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-vala \
     mingw-w64-$MSYS2_ARCH-xpm-nox
 
-export GIMP_PREFIX=`realpath ./_install`
+export GIMP_PREFIX="`realpath ./_install`${ARTIFACTS_SUFFIX}"
 export PATH="$GIMP_PREFIX/bin:$PATH"
 
 # Package ressources.
diff --git a/build/windows/installer/gimp3264.iss b/build/windows/installer/gimp3264.iss
index 3674af0a8e..5e2c0ff9b3 100755
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -160,8 +160,8 @@ LZMANumFastBytes=273
 LZMADictionarySize=524288
 
 ;SignTool=Default
-SignedUninstaller=yes
-SignedUninstallerDir=_Uninst
+;SignedUninstaller=yes
+;SignedUninstallerDir=_Uninst
 #endif //NOCOMPRESSION
 
 #if !defined(REVISION)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]