Merge pull request #13627 from gforney/master

move windows sundials and hypre build scripts to directories under Build\Sscripts to be consistent with linux build script locations
firemodels · Oct 25, 2024 · 0689aba · 0689aba
2 parents 2719406 + 38fbd94
commit 0689aba
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/Utilities/Scripts/build_hypre.bat → Build/Scripts/HYPRE/build_hypre.bat b/Utilities/Scripts/build_hypre.bat → Build/Scripts/HYPRE/build_hypre.bat
@@ -15,7 +15,12 @@ if %abort% == 1 exit /b
 
 set CURDIR=%CD%
 
-set LIBS=..\..\..\libs
+set FIREMODELS=..\..\..\..
+cd %FIREMODELS%
+set FIREMODELS=%CD%
+cd %CURDIR%
+
+set LIBS=%FIREMODELS%\libs
 if not exist %LIBS% mkdir %LIBS%
 if not exist %LIBS% echo failed to create LIBS directory
 if not exist %LIBS% exit
@@ -30,11 +35,11 @@ echo setting up Intel compilers
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
-call ..\..\Build\Scripts\setup_intel_compilers.bat
+call %FIREMODELS%\fds\Build\Scripts\setup_intel_compilers.bat
 
 cd %CURDIR%
 
-set HYPRE=..\..\..\hypre
+set HYPRE=%FIREMODELS%\hypre
 
 :: clone hypre repo (at same level as fds, smv etc repos) if it doesn't exist
 if exist %HYPRE% goto endif1
@@ -45,7 +50,7 @@ echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
 
-  cd ..\..\..
+  cd %FIREMODELS%
   git clone https://github.com/hypre-space/hypre.git
   cd hypre
 echo ----------------------------------------------------------
@@ -64,7 +69,7 @@ echo ----------------------------------------------------------
 echo.
 echo change HYPRE_FMANGLE line to #define HYPRE_FMANGLE 4
 echo after saving file, press enter
-  notepad %CURDIR%\%HYPRE%\src\config\HYPRE_config.h.cmake.in
+  notepad %HYPRE%\src\config\HYPRE_config.h.cmake.in
 
   pause
   cd %CURDIR%
@@ -77,7 +82,7 @@ echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
 
-cd %CURDIR%\%HYPRE%
+cd %HYPRE%
 set HYPRE=%CD%
 git clean -dxf
 

diff --git a/Build/Scripts/SUNDIALS/.gitignore b/Build/Scripts/SUNDIALS/.gitignore
diff --git a/Utilities/Scripts/build_sundials.bat → Build/Scripts/SUNDIALS/build_sundials.bat b/Utilities/Scripts/build_sundials.bat → Build/Scripts/SUNDIALS/build_sundials.bat
@@ -14,18 +14,22 @@ call :is_file_installed gcc   || set abort=1
 if %abort% == 1 exit /b
 
 set CURDIR=%CD%
+set FIREMODELS=..\..\..\..
+cd %FIREMODELS%
+set FIREMODELS=%CD%
+cd %CURDIR%
 
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo setting up Intel compilers
 echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
-call ..\..\Build\Scripts\setup_intel_compilers.bat
+call %FIREMODELS%\fds\Build\Scripts\setup_intel_compilers.bat
 
 cd %CURDIR%
 
-set LIBS=..\..\..\libs
+set LIBS=%FIREMODELS%\libs
 if not exist %LIBS% mkdir %LIBS%
 if not exist %LIBS% echo failed to create LIBS directory
 if not exist %LIBS% exit
@@ -35,7 +39,7 @@ set INSTALLDIR=%LIBS%\%INSTALLDIR%
 cd %CURDIR%
 
 
-set SUNDIALS=..\..\..\sundials
+set SUNDIALS=%FIREMODELS%\sundials
 
 :: clone sundials repo (at same level as fds, smv etc repos) if it doesn't exist
 if exist %SUNDIALS% goto endif1
@@ -46,7 +50,7 @@ echo ----------------------------------------------------------
 echo ----------------------------------------------------------
 echo.
 
-  cd ..\..\..
+  cd %FIREMODELS%
   git clone https://github.com/LLNL/sundials.git
   cd sundials
 echo ----------------------------------------------------------