[gimp/wip/Jehan/gimp-win32-wrapper: 2/3] gitlab-ci, build: add a wrapper for GIMP binary to Win32 CI result.



commit c47b6ab6c30a8aa333e8dadf0094dd24eac70d5a
Author: Jehan <jehan girinstud io>
Date:   Thu Oct 24 22:20:20 2019 +0200

    gitlab-ci, build: add a wrapper for GIMP binary to Win32 CI result.
    
    A few commands need to be performed the first time for glib to work
    properly, and gdk-pixbuf loaders to be found. I add them in a wrapper
    script so that it's easy to ask people to test the dev builds (even
    though it's not necessary to run these commands each time, but who
    cares!).

 .gitlab-ci.yml                                                      | 6 ++++--
 .../{crossbuild-gitlab-ci.sh => crossbuild-gitlab-ci/build-deps.sh} | 0
 build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd                 | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf227a80cb..796a7fb5d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -185,7 +185,7 @@ deps-x86_64-w64-mingw32:
     - gdk-pixbuf-query-loaders-64 > /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders.cache
   script:
     - export PATH="`pwd`/.local/bin:$PATH"
-    - crossroad w64 gimp --run="build/windows/crossbuild-gitlab-ci.sh"
+    - crossroad w64 gimp --run="build/windows/crossbuild-gitlab-ci/build-deps.sh"
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
@@ -238,7 +238,9 @@ gimp-x86_64-w64-mingw32-meson:
               -Dwmf=disabled  -Dgtk-doc=false
               -Dpython=always -Dlua=always
               -Djavascript=always -Dbuildtype=debugoptimized &&
-            ninja install' |
+            ninja install &&
+            cp ../build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd $CROSSROAD_PREFIX/bin/
+            ' |
       crossroad w64 gimp --run="-"
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
diff --git a/build/windows/crossbuild-gitlab-ci.sh b/build/windows/crossbuild-gitlab-ci/build-deps.sh
similarity index 100%
rename from build/windows/crossbuild-gitlab-ci.sh
rename to build/windows/crossbuild-gitlab-ci/build-deps.sh
diff --git a/build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd 
b/build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd
new file mode 100644
index 0000000000..957537c520
--- /dev/null
+++ b/build/windows/crossbuild-gitlab-ci/gimp-wrapper.cmd
@@ -0,0 +1,3 @@
+glib-compile-schemas.exe ..\share\glib-2.0\schemas
+gdk-pixbuf-query-loaders.exe --update-cache
+gimp-2.99.exe


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