From 42f3c02c3ed0c03bd03f7ca6aaea2ef35dc49e14 Mon Sep 17 00:00:00 2001
From: Theophile Terraz <theophile.terraz@inrae.fr>
Date: Mon, 9 Dec 2024 17:17:28 +0100
Subject: [PATCH] work on release

---
 .gitlab-ci.yml                | 35 +++++++++++++++++++++++++++++++++++
 packages/make-windows-dir.bat |  4 ++++
 2 files changed, 39 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f0ec0d5..383817ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,6 +83,34 @@ dl-mage8-windows:
       - mage8-windows/mailleurTT.exe
       - mage8-windows/libbief.dll
 
+dl-adists-linux:
+  stage: downloads
+  tags:
+    - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+  script:
+    - mkdir -p adists-linux
+    - cd adists-linux
+    - curl -L -o adists https://gitlab.irstea.fr/jean-baptiste.faure/adists/-/releases/v1.0.1/downloads/executables/adists
+  artifacts:
+    paths:
+      - adists-linux/adists
+
+dl-adists-windows:
+  stage: downloads
+  tags:
+    - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+  script:
+    - mkdir -p adists-windows
+    - cd adists-windows
+    - curl -L -o adists.exe https://gitlab.irstea.fr/jean-baptiste.faure/adists/-/releases/v1.0.1/downloads/executables/adists_win64.exe.exe
+  artifacts:
+    paths:
+      - adists-windows/adists
+
 #############
 # CONFIGURE #
 #############
@@ -224,6 +252,8 @@ build-linux:
   rules:
     - if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
   needs:
+    - job: dl-adists-linux
+      artifacts: true
     - job: dl-mage8-linux
       artifacts: true
     - job: dl-mage8-doc
@@ -260,6 +290,9 @@ build-linux:
     # Copy mage
     - mkdir -p pamhyr/mage8
     - cp -v ../mage8-linux/* pamhyr/mage8/
+    # Copy adists
+    - mkdir -p pamhyr/adists
+    - cp -v ../adists-linux/* pamhyr/adists/
     # Copy Pamhyr
     - cp -r dist/pamhyr/* pamhyr/
     # Pamhyr script to force x11
@@ -317,6 +350,8 @@ build-windows:
   needs:
     - job: dl-mage8-windows
       artifacts: true
+    - job: dl-adists-windows
+      artifacts: true
     - job: dl-mage8-doc
       artifacts: true
     - job: set-version
diff --git a/packages/make-windows-dir.bat b/packages/make-windows-dir.bat
index eae6d8f8..a485594a 100644
--- a/packages/make-windows-dir.bat
+++ b/packages/make-windows-dir.bat
@@ -46,6 +46,10 @@ copy /y ..\mage8-windows\mage_extraire.exe pamhyr\mage8\
 copy /y ..\mage8-windows\mailleurTT.exe pamhyr\mage8\
 copy /y ..\mage8-windows\libbief.dll pamhyr\mage8\
 
+rem adists
+mkdir pamhyr\adists
+copy /y ..\adists-windows\adists.exe pamhyr\adists\
+
 rem Copy tests_cases
 mkdir pamhyr\tests_cases
 mkdir pamhyr\tests_cases\Saar