[gimp-help/wip/Jehan/ci-2-10-split] More fix?!



commit e75156ed09e1e086b310a986138103cbea1f02e0
Author: Jehan <jehan girinstud io>
Date:   Fri Mar 18 14:38:43 2022 +0100

    More fix?!

 build/windows/installer/build.bat                  |  2 +-
 build/windows/installer/gimp-help.iss              | 34 +++++++++++++++-------
 .../windows/installer/installer-gimp-help-msys2.sh |  2 ++
 build/windows/installer/lang/help.en.isl           |  8 +++++
 4 files changed, 35 insertions(+), 11 deletions(-)
---
diff --git a/build/windows/installer/build.bat b/build/windows/installer/build.bat
index 2d0b87b05..5f9e122ec 100644
--- a/build/windows/installer/build.bat
+++ b/build/windows/installer/build.bat
@@ -12,7 +12,7 @@ echo "%INNOPATH%"
 FOR /D %%l in (..\..\..\htdocs\2.10\*) DO if not "%l"=="..\..\..\htdocs\2.10\." (
     if not "%l"=="..\..\..\htdocs\2.10\.." (
             echo Creating installer for %%~nxl
-            "%INNOPATH%\iscc.exe" "gimp-help.iss" /DVERSION="%1" /DLANG="%%~nxl"
+            "%INNOPATH%\iscc.exe" "gimp-help.iss" /DVERSION="%1" /DLANG="%%~nxl" 
/DHELPDIR="..\..\..\htdocs\2.10"
     )
 )
 goto end
diff --git a/build/windows/installer/gimp-help.iss b/build/windows/installer/gimp-help.iss
index 805cd8128..a958c2915 100644
--- a/build/windows/installer/gimp-help.iss
+++ b/build/windows/installer/gimp-help.iss
@@ -136,19 +136,33 @@ PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=commandline
 
 [Languages]
-#if FileExists('D:\Program Files\Inno Setup 6 Dev\Languages\' + LANGUAGE + '.isl')
-       #if FileExists('help.'+LANG+'.isl')
-Name: "{#LANG}"; MessagesFile: 
"compiler:Languages\{#LANGUAGE}.isl,N:\gimp\compile\gimp\build\windows\installer\lang\en.setup.isl,N:\gimp\compile\gimp\build\windows\installer\lang\{#LANG}.setup.isl"
-       #else
-Name: "{#LANG}"; MessagesFile: 
"compiler:Languages\{#LANGUAGE}.isl,N:\gimp\compile\gimp\build\windows\installer\lang\en.setup.isl"
-       #endif
-#else
-Name: "en"; MessagesFile: 
"compiler:Default.isl,N:\gimp\compile\gimp\build\windows\installer\lang\en.setup.isl"
-#endif
+Name: "en"; MessagesFile: "compiler:Default.isl,lang\help.en.isl"
+Name: "ca"; MessagesFile: "compiler:Languages\Catalan.isl,lang\help.en.isl"
+Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl,lang\help.en.isl"
+Name: "da"; MessagesFile: "compiler:Languages\Danish.isl,lang\help.en.isl"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl,lang\help.en.isl"
+Name: "el"; MessagesFile: "compiler:Languages\Unofficial\Greek.isl,lang\help.en.isl"
+Name: "en_GB"; MessagesFile: "compiler:Languages\Unofficial\EnglishBritish.isl,lang\help.en.isl"
+Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl,lang\help.en.isl"
+Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl,lang\help.en.isl"
+Name: "fr"; MessagesFile: "compiler:Languages\French.isl,lang\help.en.isl"
+Name: "hr"; MessagesFile: "compiler:Languages\Unofficial\Croatian.isl,lang\help.en.isl"
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl,lang\help.en.isl"
+Name: "ja"; MessagesFile: "compiler:Languages\Japanese.isl,lang\help.en.isl"
+Name: "ko"; MessagesFile: "compiler:Languages\Unofficial\Korean.isl,lang\help.en.isl"
+Name: "lt"; MessagesFile: "compiler:Languages\Unofficial\Lithuanian.isl,lang\help.en.isl"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl,lang\help.en.isl"
+Name: "nn"; MessagesFile: "compiler:Languages\Unofficial\NorwegianNynorsk.isl,lang\help.en.isl"
+Name: "pt_BR"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl,lang\help.en.isl"
+Name: "ro"; MessagesFile: "compiler:Languages\Unofficial\Romanian.isl,lang\help.en.isl"
+Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl,lang\help.en.isl"
+Name: "sl"; MessagesFile: "compiler:Languages\Slovenian.isl,lang\help.en.isl"
+Name: "sv"; MessagesFile: "compiler:Languages\Unofficial\Swedish.isl,lang\help.en.isl"
+Name: "zh_CN"; MessagesFile: "compiler:Languages\Unofficial\ChineseSimplified.isl,lang\help.en.isl"
 
 [Files]
 #ifndef nofiles
-Source: "N:\gimp\output\2.10.12\x86_64-w64-mingw32\share\gimp\2.0\help\{#LANG}\*.*"; DestDir: 
"{app}\share\gimp\2.0\help\{#LANG}"; Flags: recursesubdirs ignoreversion
+Source: "{#HELPDIR}\{#LANG}\*.*"; DestDir: "{app}\share\gimp\2.0\help\{#LANG}"; Flags: recursesubdirs 
ignoreversion
 #endif
 ;Source: "html\{#LANG}\*.jpg"; DestDir: "{app}\share\gimp\2.0\help\{#LANG}"; Flags: recursesubdirs 
nocompression
 ;Source: "html\{#LANG}\*.png"; DestDir: "{app}\share\gimp\2.0\help\{#LANG}"; Flags: recursesubdirs 
nocompression
diff --git a/build/windows/installer/installer-gimp-help-msys2.sh 
b/build/windows/installer/installer-gimp-help-msys2.sh
index 4540378d9..8a1395b90 100644
--- a/build/windows/installer/installer-gimp-help-msys2.sh
+++ b/build/windows/installer/installer-gimp-help-msys2.sh
@@ -33,10 +33,12 @@ add_bom ()
 }
 
 download_lang ChineseSimplified.isl
+download_lang Croatian.isl
 download_lang EnglishBritish.isl
 download_lang Greek.isl
 download_lang Korean.isl
 download_lang Lithuanian.isl
+download_lang NorwegianNynorsk.isl
 download_lang Romanian.isl
 download_lang Swedish.isl
 cd -
diff --git a/build/windows/installer/lang/help.en.isl b/build/windows/installer/lang/help.en.isl
new file mode 100644
index 000000000..98b496208
--- /dev/null
+++ b/build/windows/installer/lang/help.en.isl
@@ -0,0 +1,8 @@
+; to generate the language-specific .setup.isl files,
+; configure with --enable-windows-installer, and run make.
+    
+;[Messages]
+;WelcomeLabel1=Welcome to the GIMP Help Setup Wizard
+;
+[CustomMessages]
+DirNotGimp=GIMP 2.8 does not appear to be installed in the selected directory. Continue anyway?


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