[gimp-help] gitlab-ci: build the Windows installer's .isl files in the www step.



commit 3b7b46861ad275890cfef077ec69e0b9202138bb
Author: Jehan <jehan girinstud io>
Date:   Sun Mar 20 23:03:27 2022 +0100

    gitlab-ci: build the Windows installer's .isl files in the www step.
    
    I am still unsure where exactly it happens, but the LINGUAS env variable
    does affect the help.*.isl creation. I.e. that instead of using the po
    files, intltool-merge uses po-windows-installer/.intltool-merge-cache as
    set in -c option, which won't contain contents of po files from
    languages not in LINGUAS (the problem is that I'm not sure where this
    gets filled to be affected by LINGUAS).
    
    I could just remove the `-c` caching option, but on the other hand, it
    feels to me like this behavior makes sense. So instead, I'm going to
    build the isl files in the www-debian step, with no LINGUAS variable
    (i.e. for all langs).
    
    (cherry picked from commit 442698a01cf1e32d7cba2350609a813b54929b3b)

 .gitlab-ci.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 868a18223..7b2971029 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ build-image:
     paths:
     - "${HELP_DIR}"
     - "${PDF_DIR}"
-    - "${LANG_DIR}"
+    - "po-windows-installer"
   script:
     - mkdir _build
     - cd _build
@@ -45,8 +45,6 @@ build-image:
     - make && make install
     - mv ${INSTALL_PREFIX}/share/gimp/3.0/help/ ../${HELP_DIR}
     - mv ../${HELP_DIR}/pdf/ ../${PDF_DIR}
-    - mkdir -p ../${LANG_DIR}
-    - mv build/windows/installer/lang/*.isl ../${LANG_DIR}/
   timeout: 2 hours 30 minutes
   needs: ["build-image"]
 
@@ -56,7 +54,6 @@ build-debian-1:
     LINGUAS: "ca cs da de el en en_GB"
     HELP_DIR: "_html1"
     PDF_DIR: "_pdf1"
-    LANG_DIR: "_lang1/"
 
 build-debian-2:
   extends: .build-debian-base
@@ -64,7 +61,6 @@ build-debian-2:
     LINGUAS: "es fi fr hr it ja"
     HELP_DIR: "_html2"
     PDF_DIR: "_pdf2"
-    LANG_DIR: "_lang2/"
 
 build-debian-3:
   extends: .build-debian-base
@@ -72,7 +68,6 @@ build-debian-3:
     LINGUAS: "ko lt nl nn pt_BR"
     HELP_DIR: "_html3"
     PDF_DIR: "_pdf3"
-    LANG_DIR: "_lang3/"
 
 build-debian-4:
   extends: .build-debian-base
@@ -80,7 +75,6 @@ build-debian-4:
     LINGUAS: "ro ru sl sv zh_CN"
     HELP_DIR: "_html4"
     PDF_DIR: "_pdf4"
-    LANG_DIR: "_lang4/"
 
 www-debian:
   stage: www
@@ -97,8 +91,15 @@ www-debian:
     - build/windows/installer/lang/
     - htdocs/
   script:
+    - mkdir _build
+    - cd _build
+    - ../autogen.sh --prefix=${INSTALL_PREFIX} --without-gimp
+    - cd build/windows/installer/lang
+    - make
+    - cd ../../../..
+    - mv build/windows/installer/lang/help*isl ../build/windows/installer/lang/
     # build the landing pages.
-    - cd web
+    - cd ../web
     - make
     - cd ..
     - mv /html/ htdocs/
@@ -113,8 +114,6 @@ www-debian:
     - mv _html2/* htdocs/2.10/
     - mv _html3/* htdocs/2.10/
     - mv _html4/* htdocs/2.10/
-    # Move .isl files to the lang directory to be found by InnoSetup.
-    - mv _lang1/*.isl build/windows/installer/lang/
 
 win-installer:
   variables:


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