From bb662346fa3ce80ac4db673f9169103a812aabb2 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 13 Sep 2023 12:21:08 +0200
Subject: [PATCH] ci: Minor change.
---
packages/make-windows-dir.bat | 28 +++++++++++++++-------------
src/Solver/ASolver.py | 1 -
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/packages/make-windows-dir.bat b/packages/make-windows-dir.bat
index ede19b2b..2d7391e8 100644
--- a/packages/make-windows-dir.bat
+++ b/packages/make-windows-dir.bat
@@ -16,30 +16,32 @@ rem along with this program. If not, see <https://www.gnu.org/licenses/>.
@ECHO ON
-copy /y dist\pamhyr pamhyr\
+mkdir pamhyr\pamhyr
+copy /y dist\pamhyr pamhyr\pamhyr
rem Copy data
-mkdir pamhyr\View\ui\ressources
-mkdir pamhyr\View\ui\Widgets
+mkdir pamhyr\pamhyr\lang
+mkdir pamhyr\pamhyr\View\ui\ressources
+mkdir pamhyr\pamhyr\View\ui\Widgets
rem UI
-copy /y ..\src\View\ui\ressources\ pamhyr\View\ui\ressources
-copy /y ..\src\View\ui\Widgets\*.ui pamhyr\View\ui\Widgets
-copy /y ..\src\View\ui\*.ui pamhyr\View\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\
rem Lang
-copy /y ..\src\lang\*.qm pamhyr\lang\
+copy /y ..\src\lang\*.qm pamhyr\pamhyr\lang\
rem Information
-copy /y ..\VERSION pamhyr\
-copy /y ..\AUTHORS pamhyr\
-copy /y ..\LICENSE pamhyr\
+copy /y ..\VERSION pamhyr\pamhyr
+copy /y ..\AUTHORS pamhyr\pamhyr
+copy /y ..\LICENSE pamhyr\pamhyr
rem MAGE
mkdir pamhyr\mage
-copy /y ..\mage\mage.exe pamhyr\mage\
-copy /y ..\mage\mage_extraire.exe pamhyr\mage\
-copy /y ..\mage\mailleurPF.exe pamhyr\mage\
+copy /y ..\mage-windows\mage.exe pamhyr\mage\
+copy /y ..\mage-windows\mage_extraire.exe pamhyr\mage\
+copy /y ..\mage-windows\mailleurPF.exe pamhyr\mage\
rem Copy tests_cases
mkdir pamhyr\tests_cases
diff --git a/src/Solver/ASolver.py b/src/Solver/ASolver.py
index b64d7114..d71f0472 100644
--- a/src/Solver/ASolver.py
+++ b/src/Solver/ASolver.py
@@ -217,7 +217,6 @@ class AbstractSolver(object):
The executable and list of arguments
"""
# HACK: Works in most case... Trust me i'm an engineer
-
cmd = cmd.replace("@install_dir", self._install_dir())
cmd = cmd.replace("@path", path.replace(" ", "\ "))
cmd = cmd.replace("@input", self.input_param())
--
GitLab