[gimp-help/wip/Jehan/ci-master-split] gitlab-ci, build: specialize the installer scripts for gimp-help 3.0.

[Jehan <jehanp src gnome org>]

commit a2016ce3edcb118dfb75cc86d80513ca3f41a414
Author: Jehan <jehan girinstud io>
Date:   Mon Mar 21 15:10:47 2022 +0100

    gitlab-ci, build: specialize the installer scripts for gimp-help 3.0.
    
    Make the script generic when possible even, without harcoding versions!

 .gitlab-ci.yml                        | 20 +++++++++++---------
 build/windows/installer/build.bat     |  8 ++++----
 build/windows/installer/gimp-help.iss |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ac9ea97e..ad45eccea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,16 +104,18 @@ www-debian:
     - cd ..
     - mv /html/ htdocs/
     # Move all PDF quickreferences
-    - mkdir -p htdocs/2.10/pdf
-    - mv _pdf1/*.pdf htdocs/2.10/pdf/
-    - mv _pdf2/*.pdf htdocs/2.10/pdf/
-    - mv _pdf3/*.pdf htdocs/2.10/pdf/
-    - mv _pdf4/*.pdf htdocs/2.10/pdf/
+    - MAJOR_VERSION=`grep 'm4_define(\[help_major_version' configure.ac |sed 
's/m4_define(\[help_major_version.*\[\([0-9]*\)\].*/\1/'`
+    - MINOR_VERSION=`grep 'm4_define(\[help_minor_version' configure.ac |sed 
's/m4_define(\[help_minor_version.*\[\([0-9]*\)\].*/\1/'`
+    - mkdir -p htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/pdf
+    - mv _pdf1/*.pdf htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/pdf/
+    - mv _pdf2/*.pdf htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/pdf/
+    - mv _pdf3/*.pdf htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/pdf/
+    - mv _pdf4/*.pdf htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/pdf/
     # Move all the help html files.
-    - mv _html1/* htdocs/2.10/
-    - mv _html2/* htdocs/2.10/
-    - mv _html3/* htdocs/2.10/
-    - mv _html4/* htdocs/2.10/
+    - mv _html1/* htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/
+    - mv _html2/* htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/
+    - mv _html3/* htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/
+    - mv _html4/* htdocs/${MAJOR_VERSION}.${MINOR_VERSION}/
 
 win-installer:
   variables:
diff --git a/build/windows/installer/build.bat b/build/windows/installer/build.bat
index 5c3679fec..ad12d0803 100644
--- a/build/windows/installer/build.bat
+++ b/build/windows/installer/build.bat
@@ -11,11 +11,11 @@ FOR /F "usebackq tokens=5,* skip=2" %%A IN (`REG QUERY "HKLM\Software\Microsoft\
 if not exist "%INNOPATH%\iscc.exe" goto noinno
 
 echo "%INNOPATH%"
-FOR /D %%l in (..\..\..\htdocs\2.10\*) DO if not "%%l"=="..\..\..\htdocs\2.10\." (
-    if not "%%l"=="..\..\..\htdocs\2.10\.." (
-        if not "%%l"=="..\..\..\htdocs\2.10\pdf" (
+FOR /D %%l in (..\..\..\htdocs\%1.%2\*) DO if not "%%l"=="..\..\..\htdocs\%1.%2\." (
+    if not "%%l"=="..\..\..\htdocs\%1.%2\.." (
+        if not "%%l"=="..\..\..\htdocs\%1.%2\pdf" (
             echo Creating installer for %%~nxl
-            "%INNOPATH%\iscc.exe" "gimp-help.iss" /DMAJORVERSION="%1" /DMINORVERSION="%2" 
/DMICROVERSION="%3" /DLANG="%%~nxl" /DHELPDIR="..\..\..\htdocs\2.10"
+            "%INNOPATH%\iscc.exe" "gimp-help.iss" /DMAJORVERSION="%1" /DMINORVERSION="%2" 
/DMICROVERSION="%3" /DLANG="%%~nxl" /DHELPDIR="..\..\..\htdocs\%1.%2"
         )
     )
 )
diff --git a/build/windows/installer/gimp-help.iss b/build/windows/installer/gimp-help.iss
index 536b2f832..e81e77e3a 100644
--- a/build/windows/installer/gimp-help.iss
+++ b/build/windows/installer/gimp-help.iss
@@ -139,7 +139,7 @@ Name: "{#LANG}"; MessagesFile: "compiler:{#LANGFILE},lang\help.en.isl,lang\help.
 
 [Files]
 #ifndef nofiles
-Source: "{#HELPDIR}\{#LANG}\*.*"; DestDir: "{app}\share\gimp\2.0\help\{#LANG}"; Flags: recursesubdirs 
ignoreversion
+Source: "{#HELPDIR}\{#LANG}\*.*"; DestDir: "{app}\share\gimp\{#MAJORVERSION}.{#MINORVERSION}\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