[issue1121] Fix CPLEX compilation on Windows for repos not named 'dow…

…nward'.
aibasel · Oct 6, 2023 · 64070d0 · 64070d0
1 parent ff4da9a
commit 64070d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/misc/cplex2211_windows_installer.properties b/.github/workflows/misc/cplex2211_windows_installer.properties
@@ -20,11 +20,11 @@ LICENSE_ACCEPTED=TRUE
 
 #Choose installation directory
 #-----------------------------
-USER_INSTALL_DIR=D:\\a\\downward\\cplex_temp
+USER_INSTALL_DIR=D:\\a\\cplex_temp
 
 #Copy examples
 #-------------------
-CPLEX_STUDIO_EXAMPLES_DIR=D:\\a\\downward\\cplex_examples
+CPLEX_STUDIO_EXAMPLES_DIR=D:\\a\\cplex_examples
 CPLEX_STUDIO_SAMPLE_COPY_ACTIVATED=1
 
 #Associate files with CPLEX
@@ -40,17 +40,17 @@ INSTALLER_UI=silent
 
 #Install
 #------------
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\README.html=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\Uninstall.lax=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\iawin64_x64.dll=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\iawin32.dll=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\win64_32_x64.exe=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\remove.exe=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\invoker.exe=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\ibm_uninsticon.ico=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\opl\\oplide\\oplide_installer.bat=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_temp\\opl\\oplide\\oplide.exe=Yes
--fileOverwrite_D\:\\a\\downward\\cplex_examples\\.samples=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\README.html=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\Uninstall.lax=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\iawin64_x64.dll=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\iawin32.dll=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\win64_32_x64.exe=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\remove.exe=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\invoker.exe=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\ibm_uninsticon.ico=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\opl\\oplide\\oplide_installer.bat=Yes
+-fileOverwrite_D\:\\a\\cplex_temp\\opl\\oplide\\oplide.exe=Yes
+-fileOverwrite_D\:\\a\\cplex_examples\\.samples=Yes
 
 #Post installation steps
 #-------------------------------

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -12,7 +12,7 @@ env:
   CC: cl
   CXX: cl
 
-  cplex_DIR: D:\a\downward\cplex
+  cplex_DIR: D:\a\cplex
 
   CPLEX_URL: "${{ secrets.CPLEX2211_WINDOWS_URL }}"
   ZLIB_URL: "https://www.zlib.net/zlib13.zip"
@@ -72,11 +72,11 @@ jobs:
           curl.exe --output cplex.exe $ENV:CPLEX_URL
 
           echo "Install CPLEX"
-          Start-Process -FilePath .\cplex.exe -ArgumentList "-f", "D:\a\downward\downward\.github\workflows\misc\cplex2211_windows_installer.properties" -PassThru | Wait-Process
+          Start-Process -FilePath .\cplex.exe -ArgumentList "-f", "$ENV:GITHUB_WORKSPACE\.github\workflows\misc\cplex2211_windows_installer.properties" -PassThru | Wait-Process
           del .\cplex.exe
 
-          echo "Copy the relevant directory to a location which is not magically protected against cmake"
-          Xcopy /E /I ..\cplex_temp\cplex ..\cplex
+          echo "Copy the relevant directory to a location which is not magically protected against CMake"
+          Xcopy /E /I D:\a\cplex_temp\cplex $ENV:cplex_DIR
 
 
       - name: Compile planner