GNOME.org
 

[gimp/wip/Jehan/win32-distrib-job] Some cleaning.


commit fe6568aa0b68612eb44b12d7b3ee8b92d5cc8e6d
Author: Jehan <jehan girinstud io>
Date:   Thu Oct 1 15:13:25 2020 +0200

    Some cleaning.

 .gitlab-ci.yml | 77 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 27 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 675ffbcafc..0d1983db5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -350,23 +350,23 @@ win64-nightly:
     - gimp-win64
   variables:
     GIMP_PREFIX: "gimp-prefix"
-    GIMP_DISTRIB: "gimp"
+    GIMP_DISTRIB: "gimp-w64"
   artifacts:
     when: always
     paths:
-    - gimp
+    - gimp-w64
   script:
     - apt-get update
     - apt-get install -y --no-install-recommends python3 binutils-mingw-w64-x86-64 wine wine64
 
-    # Package ressources
+    # Package ressources.
     - mkdir -p ${GIMP_DISTRIB}
     - cp -fr ${GIMP_PREFIX}/etc ${GIMP_DISTRIB}
     - cp -fr ${GIMP_PREFIX}/include ${GIMP_DISTRIB}
     - cp -fr ${GIMP_PREFIX}/ssl ${GIMP_DISTRIB}
     - cp -fr ${GIMP_PREFIX}/share ${GIMP_DISTRIB}
 
-    # Package executable
+    # Package executables.
     - mkdir ${GIMP_DISTRIB}/bin
     - cp -fr ${GIMP_PREFIX}/bin/gimp*.exe ${GIMP_DISTRIB}/bin/
     - cp -fr ${GIMP_PREFIX}/bin/gdbus.exe ${GIMP_DISTRIB}/bin/
@@ -377,12 +377,12 @@ win64-nightly:
     - cp -fr ${GIMP_PREFIX}/bin/gspawn-win64-helper.exe ${GIMP_DISTRIB}/bin/
     - cp -fr ${GIMP_PREFIX}/bin/gspawn-win64-helper-console.exe ${GIMP_DISTRIB}/bin/
 
-    - cp build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd ${GIMP_DISTRIB}/
-
     - mkdir ${GIMP_DISTRIB}/libexec
     - cp -fr ${GIMP_PREFIX}/libexec/gimp*.exe ${GIMP_DISTRIB}/libexec/
 
-    # Package lib
+    - cp build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd ${GIMP_DISTRIB}/
+
+    # Package library data and modules.
     - mkdir ${GIMP_DISTRIB}/lib/
     - cp -fr ${GIMP_PREFIX}/lib/gimp ${GIMP_DISTRIB}/lib/
     - cp -fr ${GIMP_PREFIX}/lib/gio ${GIMP_DISTRIB}/lib/
@@ -391,16 +391,14 @@ win64-nightly:
     - cp -fr ${GIMP_PREFIX}/lib/babl-0.1 ${GIMP_DISTRIB}/lib/
     - cp -fr ${GIMP_PREFIX}/lib/girepository-1.0 ${GIMP_DISTRIB}/lib/
 
-    #- echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
-    #- ls /proc/sys/fs/binfmt_misc/
-    #- cat /proc/sys/fs/binfmt_misc/status
+    # Generate the loaders.cache file for GUI image support.
     - wine ${GIMP_PREFIX}/bin/gdk-pixbuf-query-loaders.exe 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll > 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
     - sed -i "s*$GIMP_DISTRIB/**" ${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
     - sed -i '/.dll"/s*/*\\\\*g' ${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
     #- glib-compile-schemas --targetdir=${GIMP_DISTRIB}/share/glib-2.0/schemas 
${GIMP_DISTRIB}/share/glib-2.0/schemas
 
-    # Package dll with a Python script using objdump
+    # Package needed DLLs only
     - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_DISTRIB}/bin/gimp-2.99.exe 
${GIMP_PREFIX}/ ${GIMP_DISTRIB}
     - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_DISTRIB}/bin/gdbus.exe ${GIMP_PREFIX}/ 
${GIMP_DISTRIB}
     - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_PREFIX}/bin/gdk-pixbuf-query-loaders.exe 
${GIMP_PREFIX}/ ${GIMP_DISTRIB}
@@ -429,7 +427,6 @@ win64-nightly:
     - for dll in ${GIMP_DISTRIB}/lib/gimp/2.99/plug-ins/*/*.exe; do
         python3 build/windows/crossbuild-gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
       done
-
   needs: ["gimp-win64"]
 
 win32-nightly:
@@ -438,23 +435,24 @@ win32-nightly:
     - gimp-win32
   variables:
     GIMP_PREFIX: "gimp-prefix"
-    GIMP_DISTRIB: "gimp"
+    GIMP_DISTRIB: "gimp-w32"
   artifacts:
     when: always
     paths:
-    - gimp
+    - gimp-w32
   script:
+    - dpkg --add-architecture i386
     - apt-get update
-    - apt-get install -y --no-install-recommends python3 binutils-mingw-w64-i686 wine binfmt-support systemd 
user-mode-linux
+    - apt-get install -y --no-install-recommends python3 binutils-mingw-w64-i686 wine wine32
 
-    # Package ressources
+    # Package ressources.
     - mkdir -p ${GIMP_DISTRIB}
     - cp -fr ${GIMP_PREFIX}/etc ${GIMP_DISTRIB}
     - cp -fr ${GIMP_PREFIX}/include ${GIMP_DISTRIB}
     - cp -fr ${GIMP_PREFIX}/ssl ${GIMP_DISTRIB}
     - cp -fr ${GIMP_PREFIX}/share ${GIMP_DISTRIB}
 
-    # Package executable
+    # Package executables.
     - mkdir ${GIMP_DISTRIB}/bin
     - cp -fr ${GIMP_PREFIX}/bin/gimp*.exe ${GIMP_DISTRIB}/bin/
     - cp -fr ${GIMP_PREFIX}/bin/gdbus.exe ${GIMP_DISTRIB}/bin/
@@ -462,15 +460,13 @@ win32-nightly:
     - cp -fr ${GIMP_PREFIX}/bin/gdk-pixbuf-query-loaders.exe ${GIMP_DISTRIB}/bin/
     - cp -fr ${GIMP_PREFIX}/bin/gdk-pixbuf-pixdata.exe ${GIMP_DISTRIB}/bin/
     - cp -fr ${GIMP_PREFIX}/bin/gdk-pixbuf-thumbnailer.exe ${GIMP_DISTRIB}/bin/
-    #- cp -fr ${GIMP_PREFIX}/bin/gspawn-win64-helper.exe ${GIMP_DISTRIB}/bin/
-    #- cp -fr ${GIMP_PREFIX}/bin/gspawn-win64-helper-console.exe ${GIMP_DISTRIB}/bin/
-
-    - cp build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd ${GIMP_DISTRIB}/
 
     - mkdir ${GIMP_DISTRIB}/libexec
     - cp -fr ${GIMP_PREFIX}/libexec/gimp*.exe ${GIMP_DISTRIB}/libexec/
 
-    # Package lib
+    - cp build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd ${GIMP_DISTRIB}/
+
+    # Package library data and modules.
     - mkdir ${GIMP_DISTRIB}/lib/
     - cp -fr ${GIMP_PREFIX}/lib/gimp ${GIMP_DISTRIB}/lib/
     - cp -fr ${GIMP_PREFIX}/lib/gio ${GIMP_DISTRIB}/lib/
@@ -479,11 +475,38 @@ win32-nightly:
     - cp -fr ${GIMP_PREFIX}/lib/babl-0.1 ${GIMP_DISTRIB}/lib/
     - cp -fr ${GIMP_PREFIX}/lib/girepository-1.0 ${GIMP_DISTRIB}/lib/
 
-    - mount none -t binfmt_misc /proc/sys/fs/binfmt_misc
-    - ls /proc/sys/fs/binfmt_misc/
-    - cat /proc/sys/fs/binfmt_misc/status
-    - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
-    - gdk-pixbuf-query-loaders.exe ${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll > 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+    # Generate the loaders.cache file for GUI image support.
+    - wine ${GIMP_PREFIX}/bin/gdk-pixbuf-query-loaders.exe 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll > 
${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
     - sed -i "s*$GIMP_DISTRIB/**" ${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
     - sed -i '/.dll"/s*/*\\\\*g' ${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+
+    #- glib-compile-schemas --targetdir=${GIMP_DISTRIB}/share/glib-2.0/schemas 
${GIMP_DISTRIB}/share/glib-2.0/schemas
+
+    # Package needed DLLs only
+    - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_DISTRIB}/bin/gimp-2.99.exe 
${GIMP_PREFIX}/ ${GIMP_DISTRIB}
+    - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_DISTRIB}/bin/gdbus.exe ${GIMP_PREFIX}/ 
${GIMP_DISTRIB}
+    - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_PREFIX}/bin/gdk-pixbuf-query-loaders.exe 
${GIMP_PREFIX}/ ${GIMP_DISTRIB}
+    - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_PREFIX}/bin/gdk-pixbuf-pixdata.exe 
${GIMP_PREFIX}/ ${GIMP_DISTRIB}
+    - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_PREFIX}/bin/gdk-pixbuf-thumbnailer.exe 
${GIMP_PREFIX}/ ${GIMP_DISTRIB}
+    - python3 build/windows/crossbuild-gitlab-ci/dll_link.py ${GIMP_PREFIX}/bin/glib-compile-schemas.exe 
${GIMP_PREFIX}/ ${GIMP_DISTRIB}
+    - python3 build/windows/crossbuild-gitlab-ci/dll_link.py 
${GIMP_PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB}
+
+    - for dll in ${GIMP_DISTRIB}/lib/babl-0.1/*.dll; do
+        python3 build/windows/crossbuild-gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
+      done
+    - for dll in ${GIMP_DISTRIB}/lib/gegl-0.4/*.dll; do
+        python3 build/windows/crossbuild-gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
+      done
+    - for dll in ${GIMP_DISTRIB}/lib/gio/modules/*.dll; do
+        python3 build/windows/crossbuild-gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
+      done
+    - for dll in ${GIMP_DISTRIB}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll; do
+        python3 build/windows/crossbuild-gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
+      done
+    - for dll in ${GIMP_DISTRIB}/lib/gimp/2.99/modules/*.dll; do
+        python3 build/windows/crossbuild-gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
+      done
+    - for dll in ${GIMP_DISTRIB}/lib/gimp/2.99/plug-ins/*/*.exe; do
+        python3 build/windows/crossbuild-gitlab-ci/dll_link.py $dll ${GIMP_PREFIX}/ ${GIMP_DISTRIB};
+      done
   needs: ["gimp-win32"]
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]