From 421185573217431cbd26350160a314ef4e728784 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 9 Oct 2023 12:05:29 +0200
Subject: [PATCH] ci: Update ci build instruction.

---
 .gitlab-ci.yml                | 29 +++++++++++++++++------------
 packages/make-windows-dir.bat | 28 +++++++++++++++++-----------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b58f4f4..381c127f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,34 +155,39 @@ build-linux:
     - mkdir -p pamhyr
     - mkdir -p pamhyr/pamhyr
     # Copy Pamhyr info
-    - cp -v ../VERSION pamhyr/pamhyr/
-    - cp -v ../AUTHORS pamhyr/pamhyr/
-    - cp -v ../LICENSE pamhyr/pamhyr/
+    - cp -v ../VERSION pamhyr/pamhyr/_internal/
+    - cp -v ../AUTHORS pamhyr/pamhyr/_internal/
+    - cp -v ../LICENSE pamhyr/pamhyr/_internal/
     # Copy mage
     - mkdir -p pamhyr/mage
     - cp -v ../mage-linux/* pamhyr/mage/
     # Copy Pamhyr
     - cp -r dist/pamhyr pamhyr/
     # Copy Pamhyr resources
-    - mkdir -p pamhyr/pamhyr/View
-    - mkdir -p pamhyr/pamhyr/View/ui
-    - mkdir -p pamhyr/pamhyr/View/ui/Widgets
-    - cp -r ../src/View/ui/*.ui pamhyr/pamhyr/View/ui/
-    - cp -r ../src/View/ui/ressources/ pamhyr/pamhyr/View/ui
-    - cp -r ../src/View/ui/Widgets/*.ui pamhyr/pamhyr/View/ui/Widgets
+    - mkdir -p pamhyr/pamhyr/_internal/View
+    - mkdir -p pamhyr/pamhyr/_internal/View/ui
+    - mkdir -p pamhyr/pamhyr/_internal/View/ui/Widgets
+    - cp -r ../src/View/ui/*.ui pamhyr/pamhyr/_internal/View/ui/
+    - cp -r ../src/View/ui/ressources/ pamhyr/pamhyr/_internal/View/ui
+    - cp -r ../src/View/ui/Widgets/*.ui pamhyr/pamhyr/_internal/View/ui/Widgets
     # Copy lang
-    - mkdir -p pamhyr/pamhyr/lang
-    - cp -r ../src/lang/*.qm pamhyr/pamhyr/lang
+    - mkdir -p pamhyr/pamhyr/_internal/lang
+    - cp -r ../src/lang/*.qm pamhyr/pamhyr/_internal/lang
     # Copy tests cases
     - mkdir -p pamhyr/tests_cases/
     - mkdir -p pamhyr/tests_cases/Saar
     - cp ../tests_cases/Saar/Saar.pamhyr pamhyr/tests_cases/Saar/
     # Copy documentations
     - mkdir -p pamhyr/doc/
+    - mkdir -p pamhyr/doc/images/
     - mkdir -p pamhyr/doc/html/
     - cp ../doc/users/documentation.pdf pamhyr/doc/Pamhyr2-users.pdf
+    - cp ../doc/users/documentation.html pamhyr/doc/Pamhyr2-users.html
     - cp ../doc/dev/documentation.pdf pamhyr/doc/Pamhyr2-dev.pdf
-    - cp ../doc/dev/documentation.html pamhyr/doc/html/dev.html
+    - cp ../doc/dev/documentation.html pamhyr/doc/Pamhyr2-dev.html
+    - cp ../doc/users/images/* pamhyr/doc/images
+    - cp ../doc/dev/images/* pamhyr/doc/images
+    - cp ../doc/images/* pamhyr/doc/images
     # Create running script
     - echo "#!/bin/sh" > pamhyr/Pamhyr2
     - echo "./pamhyr/pamhyr $@" >> pamhyr/Pamhyr2
diff --git a/packages/make-windows-dir.bat b/packages/make-windows-dir.bat
index 1045b4d4..0f35ba28 100644
--- a/packages/make-windows-dir.bat
+++ b/packages/make-windows-dir.bat
@@ -16,26 +16,26 @@ rem along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 @ECHO ON
 
-mkdir pamhyr\pamhyr
+mkdir pamhyr\pamhyr\_internal
 xcopy /s /e /y dist\pamhyr pamhyr\pamhyr
 
 rem Copy data
-mkdir pamhyr\pamhyr\lang
-mkdir pamhyr\pamhyr\View\ui\ressources
-mkdir pamhyr\pamhyr\View\ui\Widgets
+mkdir pamhyr\pamhyr\_internal\lang
+mkdir pamhyr\pamhyr\_internal\View\ui\ressources
+mkdir pamhyr\pamhyr\_internal\View\ui\Widgets
 
 rem UI
-copy /y ..\src\View\ui\ressources\ pamhyr\pamhyr\View\ui\ressources
-copy /y ..\src\View\ui\Widgets\*.ui pamhyr\pamhyr\View\ui\Widgets
-copy /y ..\src\View\ui\*.ui pamhyr\pamhyr\View\ui\
+copy /y ..\src\View\ui\ressources\ pamhyr\pamhyr\_internal\View\ui\ressources
+copy /y ..\src\View\ui\Widgets\*.ui pamhyr\pamhyr\_internal\View\ui\Widgets
+copy /y ..\src\View\ui\*.ui pamhyr\pamhyr\_internal\View\ui\
 
 rem Lang
-copy /y ..\src\lang\*.qm pamhyr\pamhyr\lang\
+copy /y ..\src\lang\*.qm pamhyr\pamhyr\_internal\lang\
 
 rem Information
-copy /y ..\VERSION pamhyr\pamhyr
-copy /y ..\AUTHORS pamhyr\pamhyr
-copy /y ..\LICENSE pamhyr\pamhyr
+copy /y ..\VERSION pamhyr\pamhyr\_internal
+copy /y ..\AUTHORS pamhyr\pamhyr\_internal
+copy /y ..\LICENSE pamhyr\pamhyr\_internal
 
 rem MAGE
 mkdir pamhyr\mage
@@ -50,5 +50,11 @@ copy /y ..\tests_cases\Saar\Saar.pamhyr pamhyr\tests_cases\Saar\
 
 rem Documentations
 mkdir pamhyr\doc
+mkdir pamhyr\doc\images
 copy /y ..\doc\users\documentation.pdf pamhyr\doc\Pamhyr2-users.pdf
 copy /y ..\doc\dev\documentation.pdf pamhyr\doc\Pamhyr2-dev.pdf
+copy /y ..\doc\users\documentation.html pamhyr\doc\Pamhyr2-users.html
+copy /y ..\doc\dev\documentation.html pamhyr\doc\Pamhyr2-dev.html
+copy /y ..\doc\users\images\* pamhyr\doc\images
+copy /y ..\doc\dev\images\* pamhyr\doc\images
+copy /y ..\doc\images\* pamhyr\doc\images