[gimp-help/wip/Jehan/ci-2-10-split] Experimenting with Windows syntax.



commit 42342dfe3633b866d9690db8cb5870707a0758f3
Author: Jehan <jehan girinstud io>
Date:   Thu Mar 17 19:59:39 2022 +0100

    Experimenting with Windows syntax.

 .gitlab-ci.yml                    |  3 +--
 build/windows/installer/build.bat | 14 ++++++++++----
 htdocs/2.10/en/plop               |  0
 htdocs/2.10/ko/plop               |  0
 4 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48f72d743..f14b30e3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,8 +112,6 @@ win-installer:
   tags:
     - win32-ps
   stage: distribution
-  dependencies:
-    - www-debian
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
     when: always
@@ -124,3 +122,4 @@ win-installer:
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/installer/installer-gimp-help-msys2.sh > 
installer.log 2>&1"
+  needs: []
diff --git a/build/windows/installer/build.bat b/build/windows/installer/build.bat
index 475835176..524847a18 100644
--- a/build/windows/installer/build.bat
+++ b/build/windows/installer/build.bat
@@ -1,17 +1,23 @@
 @echo off
 if "%1"=="" goto help
 
+echo 1
 if [%INNOPATH%]==[] (
 FOR /F "usebackq tokens=5,* skip=2" %%A IN (`REG QUERY 
"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 6_is1" /v "Inno Setup: App 
Path" /reg:32`) DO set INNOPATH=%%B
 ) else (if [%INNOPATH%]==[] (
 FOR /F "usebackq tokens=5,* skip=2" %%A IN (`REG QUERY 
"HKLM\Software\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 6_is1" /v "Inno Setup: App Path" 
/reg:32`) DO set INNOPATH=%%B
 ))
+echo 2
 if not exist "%INNOPATH%\iscc.exe" goto noinno
+echo 3
 
-FOR /D %%l in (..\..\..\htdocs\2.10\*) DO if not "%l"=="..\..\..\htdocs\2.10\." (if not 
"%l"=="..\..\..\htdocs\2.10\.." (
-       echo %@name[%l]
-       start "" /LOW "%INNOPATH%\iscc.exe" "gimp-help.iss" /DVERSION="%1" /DLANG="%@name[%l]"
-))
+FOR /D %%l in (..\..\..\htdocs\2.10\*) DO if not "%l"=="..\..\..\htdocs\2.10\." (
+    if not "%l"=="..\..\..\htdocs\2.10\.." (
+            echo %@name[%l]
+            start "" /LOW "%INNOPATH%\iscc.exe" "gimp-help.iss" /DVERSION="%1" /DLANG="%@name[%l]"
+    )
+)
+echo 4
 goto end
 
 :help
diff --git a/htdocs/2.10/en/plop b/htdocs/2.10/en/plop
new file mode 100644
index 000000000..e69de29bb
diff --git a/htdocs/2.10/ko/plop b/htdocs/2.10/ko/plop
new file mode 100644
index 000000000..e69de29bb


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