From 74d8a28dea115f68a01acea0a85ad6dde83dacf0 Mon Sep 17 00:00:00 2001 From: gforney Date: Fri, 1 Nov 2024 20:02:53 -0400 Subject: [PATCH 1/7] scripts: add add windows 3rd part build script, add clean options to library build scripts --- Build/Scripts/HYPRE/build_hypre.bat | 43 ++++++++---- Build/Scripts/SUNDIALS/build_sundials.bat | 42 +++++++++--- Build/Scripts/build_thirdparty_libs.bat | 74 +++++++++++++++++++++ Build/impi_intel_win/make_fds.bat | 2 + Build/impi_intel_win_db/make_fds.bat | 2 + Build/impi_intel_win_dv/make_fds.bat | 2 + Build/impi_intel_win_openmp/make_fds.bat | 2 + Build/impi_intel_win_openmp_db/make_fds.bat | 2 + Build/impi_intel_win_openmp_dv/make_fds.bat | 2 + Build/impi_intel_win_vt/make_fds.bat | 2 + 10 files changed, 149 insertions(+), 24 deletions(-) create mode 100644 Build/Scripts/build_thirdparty_libs.bat diff --git a/Build/Scripts/HYPRE/build_hypre.bat b/Build/Scripts/HYPRE/build_hypre.bat index ac4fc68d4fa..52bb5dcea75 100644 --- a/Build/Scripts/HYPRE/build_hypre.bat +++ b/Build/Scripts/HYPRE/build_hypre.bat @@ -8,6 +8,8 @@ set LIB_DIR=%LIB_TAG% ::*** placehoder for parsing options +set clean_hypre= + call :getopts %* if %stopscript% == 1 exit /b @@ -28,31 +30,44 @@ cd %FIREMODELS% set FIREMODELS=%CD% cd %CURDIR% +set INSTALLDIR=%FIREMODELS%\libs\hypre\%LIB_DIR% + +::*** erase install directory if clean option was specified + +if "x%clean_hypre%" == "x" goto endif1 + if exist %INSTALLDIR% rmdir /s /q %INSTALLDIR% +:endif1 + ::*** if hypre library directory exists exit and use it -set INSTALLDIR=%FIREMODELS%\libs\hypre\%LIB_DIR% -if not exist %INSTALLDIR% goto endif1 +if not exist %INSTALLDIR% goto endif2 set HYPRE_HOME=%INSTALLDIR% set buildstatus=prebuilt goto eof -:endif1 +:endif2 ::*** if directory pointed to by HYPRE_HOME exists exit and use it -if "x%HYPRE_HOME%" == "x" goto endif2 - if not exist %HYPRE_HOME% goto endif2 +if "x%HYPRE_HOME%" == "x" goto endif3 +if not exist %HYPRE_HOME% goto endif3 +if "x%clean_hypre%" == "x" goto endif3 + rmdir /s /q %HYPRE_HOME% +:endif3 + +if "x%HYPRE_HOME%" == "x" goto endif4 + if not exist %HYPRE_HOME% goto endif4 set buildstatus=prebuilt goto eof -:endif2 +:endif4 ::*** if hypre repo does not exist exit and build fds without it set LIB_REPO=%FIREMODELS%\hypre -if exist %LIB_REPO% goto endif3 +if exist %LIB_REPO% goto endif5 set HYPRE_HOME= set buildstatus=norepo goto eof -:endif3 +:endif5 ::*** if we've gotten this far the prebuilt libraries do not exist, the repo does exist so build the hypre library @@ -92,15 +107,13 @@ git checkout %LIB_TAG% echo. echo ---------------------------------------------------------- echo ---------------------------------------------------------- -echo modify HYPRE_config.h.cmake.in file +echo changing HYPRE_FMANGLE 0 to HYPRE_FMANGLE 4 +echo in the file HYPRE_config.h.cmake.in echo ---------------------------------------------------------- echo ---------------------------------------------------------- echo. -echo change HYPRE_FMANGLE line to #define HYPRE_FMANGLE 4 -echo after saving file, press enter -notepad %LIB_REPO%\src\config\HYPRE_config.h.cmake.in +powershell -Command "(Get-Content %LIB_REPO%\src\config\HYPRE_config.h.cmake.in) -replace 'HYPRE_FMANGLE 0', 'HYPRE_FMANGLE 4' | Set-Content %LIB_REPO%\src\config\HYPRE_config.h.cmake.in" -pause cd %CURDIR% echo. @@ -157,6 +170,10 @@ goto eof if (%1)==() exit /b set valid=0 set arg=%1 + if /I "%1" EQU "--clean-hypre" ( + set clean_hypre=1 + set valid=1 + ) if /I "%1" EQU "-help" ( call :usage set stopscript=1 diff --git a/Build/Scripts/SUNDIALS/build_sundials.bat b/Build/Scripts/SUNDIALS/build_sundials.bat index ac78a83e298..495b64b0a87 100644 --- a/Build/Scripts/SUNDIALS/build_sundials.bat +++ b/Build/Scripts/SUNDIALS/build_sundials.bat @@ -7,6 +7,7 @@ set LIB_DIR=%LIB_TAG% ::*** placehoder for parsing options +set clean_sundials= call :getopts %* if %stopscript% == 1 exit /b @@ -27,31 +28,46 @@ cd %FIREMODELS% set FIREMODELS=%CD% cd %CURDIR% +set INSTALLDIR=%FIREMODELS%\libs\sundials\%LIB_DIR% + +::*** erase directory if it exists and clean option was specified + +if "x%clean_sundials%" == "x" goto endif1 + if exist %INSTALLDIR% rmdir /s /q %INSTALLDIR% +:endif1 + ::*** if sundials library directory exists exit and use it -set INSTALLDIR=%FIREMODELS%\libs\sundials\%LIB_DIR% -if not exist %INSTALLDIR% goto endif1 +if not exist %INSTALLDIR% goto endif2 set SUNDIALS_HOME=%INSTALLDIR% set buildstatus=prebuilt goto eof -:endif1 +:endif2 + +::*** erase directory if it exists and clean option was specified + +if "x%SUNDIALS_HOME%" == "x" goto endif3 +if not exist %SUNDIALS_HOME% goto endif3 +if "x%clean_sundials%" == "x" goto endif3 + rmdir /s /q %SUNDIALS_HOME% +:endif3 ::*** if directory pointed to by SUNDIALS_HOME exists exit and use it -if "x%SUNDIALS_HOME%" == "x" goto endif2 - if not exist %SUNDIALS_HOME% goto endif2 - set buildstatus=prebuilt - goto eof -:endif2 +if "x%SUNDIALS_HOME%" == "x" goto endif4 +if not exist %SUNDIALS_HOME% goto endif4 + set buildstatus=prebuilt + goto eof +:endif4 ::*** if sundials repo does not exist exit and build fds without it set LIB_REPO=%FIREMODELS%\sundials -if exist %LIB_REPO% goto endif3 +if exist %LIB_REPO% goto endif5 set SUNDIALS_HOME= set buildstatus=norepo goto eof -:endif3 +:endif5 ::*** if we've gotten this far the prebuilt libraries do not exist, the repo does exist so build the sundials library @@ -161,7 +177,11 @@ goto eof if (%1)==() exit /b set valid=0 set arg=%1 - if /I "%1" EQU "-help" ( +if /I "%1" EQU "--clean-sundials" ( + set clean_sundials=1 + set valid=1 + ) +if /I "%1" EQU "-help" ( call :usage set stopscript=1 exit /b diff --git a/Build/Scripts/build_thirdparty_libs.bat b/Build/Scripts/build_thirdparty_libs.bat new file mode 100644 index 00000000000..23425941cc6 --- /dev/null +++ b/Build/Scripts/build_thirdparty_libs.bat @@ -0,0 +1,74 @@ +@echo off + +set clean_hypre= +set clean_sundials= + +call :getopts %* +if %stopscript% == 1 exit /b + + +goto eof + +:: ------------------------------------------------------------- +:getopts +:: ------------------------------------------------------------- + set stopscript=0 + if (%1)==() exit /b + set valid=0 + set arg=%1 + if /I "%1" EQU "--clean-hypre" ( + set clean_hypre=--clean-hypre + set valid=1 + ) + if /I "%1" EQU "bot" ( + set valid=1 + ) + if /I "%1" EQU "--clean-sundials" ( + set clean_sundials=--clean-sundials + set valid=1 + ) + if /I "%1" EQU "--clean-all" ( + set clean_hypre=--clean-hypre + set clean_sundials=--clean-sundials + set valid=1 + ) + if /I "%1" EQU "-help" ( + call :usage + set stopscript=1 + exit /b + ) + shift + if %valid% == 0 ( + echo. + echo ***Error: the input argument %arg% is invalid + echo. + echo Usage: + call :usage + set stopscript=1 + exit /b + ) +if not (%1)==() goto getopts +exit /b + +:: ------------------------------------------------------------- +:usage +:: ------------------------------------------------------------- +echo build hypre +echo. +echo -help - display this message +exit /b + +:eof + +set CURDIR_3RDPARTY=%CD% +set SCRIPTDIR=%~dp0 +cd %SCRIPTDIR% +SET SCRIPTDIR=%CD% + +cd %SCRIPTDIR%\HYPRE +call build_hypre %clean_hypre% + +cd %SCRIPTDIR%\SUNDIALS +call build_sundials %clean_sundials% + +cd %CURDIR_3RDPARTY% \ No newline at end of file diff --git a/Build/impi_intel_win/make_fds.bat b/Build/impi_intel_win/make_fds.bat index f8599d5f0bd..19668a1f8b6 100644 --- a/Build/impi_intel_win/make_fds.bat +++ b/Build/impi_intel_win/make_fds.bat @@ -8,6 +8,8 @@ if x%arg1% == xbot goto endif1 call ..\Scripts\setup_intel_compilers.bat :endif1 +::call ..\Scripts\build_thirdparty_libs %* + Title Building FDS (Intel MPI/%INTEL_IFORT%) for 64 bit Windows %TARGET% make SHELL="%ComSpec%" VPATH="../../Source" -f ..\makefile %TARGET% diff --git a/Build/impi_intel_win_db/make_fds.bat b/Build/impi_intel_win_db/make_fds.bat index ab002311c95..5eb6cfb11fd 100644 --- a/Build/impi_intel_win_db/make_fds.bat +++ b/Build/impi_intel_win_db/make_fds.bat @@ -8,6 +8,8 @@ if x%arg1% == xbot goto endif1 call ..\Scripts\setup_intel_compilers.bat :endif1 +::call ..\Scripts\build_thirdparty_libs %* + Title Building debug FDS (Intel MPI/%INTEL_IFORT%) for 64 bit Windows %TARGET% make SHELL="%ComSpec%" VPATH="../../Source" -f ..\makefile %TARGET% diff --git a/Build/impi_intel_win_dv/make_fds.bat b/Build/impi_intel_win_dv/make_fds.bat index d20b8a53a9f..2f8dc8cd080 100644 --- a/Build/impi_intel_win_dv/make_fds.bat +++ b/Build/impi_intel_win_dv/make_fds.bat @@ -8,6 +8,8 @@ if x%arg1% == xbot goto endif1 call ..\Scripts\setup_intel_compilers.bat :endif1 +::call ..\Scripts\build_thirdparty_libs %* + Title Building DV FDS (Intel MPI/%INTEL_IFORT%) for 64 bit Windows %TARGET% make SHELL="%ComSpec%" VPATH="../../Source" -f ..\makefile %TARGET% diff --git a/Build/impi_intel_win_openmp/make_fds.bat b/Build/impi_intel_win_openmp/make_fds.bat index 9723b066695..cde89571f39 100644 --- a/Build/impi_intel_win_openmp/make_fds.bat +++ b/Build/impi_intel_win_openmp/make_fds.bat @@ -8,6 +8,8 @@ if x%arg1% == xbot goto endif1 call ..\Scripts\setup_intel_compilers.bat :endif1 +::call ..\Scripts\build_thirdparty_libs %* + Title Building OpenMP FDS (Intel MPI/%INTEL_IFORT% OpenMP) for 64 bit Windows %TARGET% make SHELL="%ComSpec%" VPATH="../../Source" -f ..\makefile %TARGET% diff --git a/Build/impi_intel_win_openmp_db/make_fds.bat b/Build/impi_intel_win_openmp_db/make_fds.bat index 2977966636b..a040474b9c9 100644 --- a/Build/impi_intel_win_openmp_db/make_fds.bat +++ b/Build/impi_intel_win_openmp_db/make_fds.bat @@ -8,6 +8,8 @@ if x%arg1% == xbot goto endif1 call ..\Scripts\setup_intel_compilers.bat :endif1 +::call ..\Scripts\build_thirdparty_libs %* + Title Building debug OpenMP FDS (Intel MPI/%INTEL_IFORT% OpenMP) for 64 bit Windows %TARGET% make SHELL="%ComSpec%" VPATH="../../Source" -f ..\makefile %TARGET% diff --git a/Build/impi_intel_win_openmp_dv/make_fds.bat b/Build/impi_intel_win_openmp_dv/make_fds.bat index 92a90c214cc..e9babd4cbe7 100644 --- a/Build/impi_intel_win_openmp_dv/make_fds.bat +++ b/Build/impi_intel_win_openmp_dv/make_fds.bat @@ -8,6 +8,8 @@ if x%arg1% == xbot goto endif1 call ..\Scripts\setup_intel_compilers.bat :endif1 +::call ..\Scripts\build_thirdparty_libs %* + Title Building dv OpenMP FDS (Intel MPI/%INTEL_IFORT% OpenMP) for 64 bit Windows %TARGET% make SHELL="%ComSpec%" VPATH="../../Source" -f ..\makefile %TARGET% diff --git a/Build/impi_intel_win_vt/make_fds.bat b/Build/impi_intel_win_vt/make_fds.bat index f8599d5f0bd..19668a1f8b6 100644 --- a/Build/impi_intel_win_vt/make_fds.bat +++ b/Build/impi_intel_win_vt/make_fds.bat @@ -8,6 +8,8 @@ if x%arg1% == xbot goto endif1 call ..\Scripts\setup_intel_compilers.bat :endif1 +::call ..\Scripts\build_thirdparty_libs %* + Title Building FDS (Intel MPI/%INTEL_IFORT%) for 64 bit Windows %TARGET% make SHELL="%ComSpec%" VPATH="../../Source" -f ..\makefile %TARGET% From a29a29628dfc12f600d43168dc9cec8bae637715 Mon Sep 17 00:00:00 2001 From: gforney Date: Fri, 1 Nov 2024 20:28:21 -0400 Subject: [PATCH 2/7] scripts: add --clean-all option to bash 3rd part build lib script --- Build/Scripts/build_thirdparty_libs.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Build/Scripts/build_thirdparty_libs.sh b/Build/Scripts/build_thirdparty_libs.sh index a279dddcdb4..03226b8b82d 100755 --- a/Build/Scripts/build_thirdparty_libs.sh +++ b/Build/Scripts/build_thirdparty_libs.sh @@ -14,6 +14,11 @@ ARG="" # Loop through the options while [[ $# -gt 0 ]]; do case "$1" in + --clean-all) + clean_hypre=true + clean_sundials=true + shift + ;; --clean-hypre) clean_hypre=true # Set the flag to true when --clean-hypre is used shift From 6474f0b08cb76d31fb5b2af9d16d13f548d1632e Mon Sep 17 00:00:00 2001 From: gforney Date: Fri, 1 Nov 2024 20:29:51 -0400 Subject: [PATCH 3/7] scripts: add info to windows build lib usage routines --- Build/Scripts/HYPRE/build_hypre.bat | 1 + Build/Scripts/SUNDIALS/build_sundials.bat | 1 + Build/Scripts/build_thirdparty_libs.bat | 9 ++++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Build/Scripts/HYPRE/build_hypre.bat b/Build/Scripts/HYPRE/build_hypre.bat index 52bb5dcea75..da1ac623c22 100644 --- a/Build/Scripts/HYPRE/build_hypre.bat +++ b/Build/Scripts/HYPRE/build_hypre.bat @@ -227,6 +227,7 @@ exit /b :: ------------------------------------------------------------- echo build hypre echo. +echo -clean-hypre - force build of hypre library echo -help - display this message exit /b diff --git a/Build/Scripts/SUNDIALS/build_sundials.bat b/Build/Scripts/SUNDIALS/build_sundials.bat index 495b64b0a87..5eba63ecb78 100644 --- a/Build/Scripts/SUNDIALS/build_sundials.bat +++ b/Build/Scripts/SUNDIALS/build_sundials.bat @@ -234,6 +234,7 @@ exit /b :: ------------------------------------------------------------- echo build sundials echo. +echo -build-sundials - force build of sundials library echo -help - display this message exit /b diff --git a/Build/Scripts/build_thirdparty_libs.bat b/Build/Scripts/build_thirdparty_libs.bat index 23425941cc6..51d921d23d1 100644 --- a/Build/Scripts/build_thirdparty_libs.bat +++ b/Build/Scripts/build_thirdparty_libs.bat @@ -53,9 +53,12 @@ exit /b :: ------------------------------------------------------------- :usage :: ------------------------------------------------------------- -echo build hypre -echo. -echo -help - display this message +echo build 3rd party libraries +echo. +echo --clean-all - rebuild all libraries +echo --clean-hypre - rebuild hypre library +echo --clean-sundials - rebuild sundials library +echo -help - display this message exit /b :eof From 9f75ca481a29006e3ce77d03c8e5bf57dea11fe2 Mon Sep 17 00:00:00 2001 From: gforney Date: Sat, 2 Nov 2024 22:01:36 -0400 Subject: [PATCH 4/7] build lib scripts: correct build order in windows library build scripts --- Build/Scripts/HYPRE/build_hypre.bat | 45 ++++++++++++----------- Build/Scripts/SUNDIALS/build_sundials.bat | 41 ++++++++++----------- 2 files changed, 42 insertions(+), 44 deletions(-) diff --git a/Build/Scripts/HYPRE/build_hypre.bat b/Build/Scripts/HYPRE/build_hypre.bat index da1ac623c22..205cb519dfb 100644 --- a/Build/Scripts/HYPRE/build_hypre.bat +++ b/Build/Scripts/HYPRE/build_hypre.bat @@ -6,7 +6,7 @@ set LIB_TAG=v2.32.0 set LIB_DIR=%LIB_TAG% -::*** placehoder for parsing options +::*** parse options set clean_hypre= @@ -46,31 +46,27 @@ if not exist %INSTALLDIR% goto endif2 goto eof :endif2 -::*** if directory pointed to by HYPRE_HOME exists exit and use it - -if "x%HYPRE_HOME%" == "x" goto endif3 -if not exist %HYPRE_HOME% goto endif3 -if "x%clean_hypre%" == "x" goto endif3 - rmdir /s /q %HYPRE_HOME% -:endif3 +::*** if hypre repo exists build library -if "x%HYPRE_HOME%" == "x" goto endif4 - if not exist %HYPRE_HOME% goto endif4 - set buildstatus=prebuilt - goto eof -:endif4 +set LIB_REPO=%FIREMODELS%\hypre +if exist %LIB_REPO% goto buildlib -::*** if hypre repo does not exist exit and build fds without it +::*** if directory pointed to by HYPRE_HOME exists exit and use it +:: if it doesn't exist then exit and build fds without the hypre library -set LIB_REPO=%FIREMODELS%\hypre -if exist %LIB_REPO% goto endif5 +if "x%HYPRE_HOME%" == "x" goto else4 +if not exist %HYPRE_HOME% goto else4 + set buildstatus=prebuilt + goto endif4 +:else4 set HYPRE_HOME= set buildstatus=norepo - goto eof -:endif5 +:endif4 +goto eof ::*** if we've gotten this far the prebuilt libraries do not exist, the repo does exist so build the hypre library +:buildlib cd %CURDIR% echo. @@ -174,6 +170,11 @@ goto eof set clean_hypre=1 set valid=1 ) + if /I "%1" EQU "--help" ( + call :usage + set stopscript=1 + exit /b + ) if /I "%1" EQU "-help" ( call :usage set stopscript=1 @@ -227,11 +228,11 @@ exit /b :: ------------------------------------------------------------- echo build hypre echo. -echo -clean-hypre - force build of hypre library -echo -help - display this message +echo --clean-hypre - force build of hypre library +echo --help - display this message exit /b :eof echo. -if "%buildstatus%" == "norepo" echo HYPRE library not built, The hypre git repo does not exist -if "%buildstatus%" == "prebuilt" echo HYPRE library not built. It exists in %HYPRE_HOME% +if "%buildstatus%" == "norepo" echo Hypre library not built, The hypre git repo does not exist +if "%buildstatus%" == "prebuilt" echo Hypre library not built. It exists in %HYPRE_HOME% diff --git a/Build/Scripts/SUNDIALS/build_sundials.bat b/Build/Scripts/SUNDIALS/build_sundials.bat index 5eba63ecb78..f2a5a2c8bbe 100644 --- a/Build/Scripts/SUNDIALS/build_sundials.bat +++ b/Build/Scripts/SUNDIALS/build_sundials.bat @@ -5,7 +5,7 @@ set LIB_TAG=v6.7.0 set LIB_DIR=%LIB_TAG% -::*** placehoder for parsing options +::*** parse options set clean_sundials= call :getopts %* @@ -44,33 +44,25 @@ if not exist %INSTALLDIR% goto endif2 goto eof :endif2 -::*** erase directory if it exists and clean option was specified +::*** sundials library doesn't exist, if sundials repo exists build sundials library -if "x%SUNDIALS_HOME%" == "x" goto endif3 -if not exist %SUNDIALS_HOME% goto endif3 -if "x%clean_sundials%" == "x" goto endif3 - rmdir /s /q %SUNDIALS_HOME% -:endif3 +set LIB_REPO=%FIREMODELS%\sundials +if exist %LIB_REPO% goto buildlib ::*** if directory pointed to by SUNDIALS_HOME exists exit and use it -if "x%SUNDIALS_HOME%" == "x" goto endif4 -if not exist %SUNDIALS_HOME% goto endif4 - set buildstatus=prebuilt - goto eof +if "x%SUNDIALS_HOME%" == "x" goto else4 +if not exist %SUNDIALS_HOME% goto else4 + set buildstatus=prebuilt + goto endif4 +:else4 + set build_status=norepo :endif4 - -::*** if sundials repo does not exist exit and build fds without it - -set LIB_REPO=%FIREMODELS%\sundials -if exist %LIB_REPO% goto endif5 - set SUNDIALS_HOME= - set buildstatus=norepo - goto eof -:endif5 +goto eof ::*** if we've gotten this far the prebuilt libraries do not exist, the repo does exist so build the sundials library +:buildlib cd %LIB_REPO% set buildstatus=build @@ -181,6 +173,11 @@ if /I "%1" EQU "--clean-sundials" ( set clean_sundials=1 set valid=1 ) +if /I "%1" EQU "--help" ( + call :usage + set stopscript=1 + exit /b + ) if /I "%1" EQU "-help" ( call :usage set stopscript=1 @@ -234,8 +231,8 @@ exit /b :: ------------------------------------------------------------- echo build sundials echo. -echo -build-sundials - force build of sundials library -echo -help - display this message +echo --clean-sundials - force build of sundials library +echo --help - display this message exit /b :eof From e828d5987b9fbdf30705f42063f3645ca7c5b647 Mon Sep 17 00:00:00 2001 From: gforney Date: Sat, 2 Nov 2024 22:41:53 -0400 Subject: [PATCH 5/7] scripts: clean fds build directory if building 3rd part libraries --- Build/Scripts/HYPRE/build_hypre.bat | 8 ++++++++ Build/Scripts/SUNDIALS/build_sundials.bat | 8 ++++++++ Build/Scripts/build_thirdparty_libs.bat | 1 + 3 files changed, 17 insertions(+) diff --git a/Build/Scripts/HYPRE/build_hypre.bat b/Build/Scripts/HYPRE/build_hypre.bat index 205cb519dfb..02168ce2f26 100644 --- a/Build/Scripts/HYPRE/build_hypre.bat +++ b/Build/Scripts/HYPRE/build_hypre.bat @@ -154,6 +154,14 @@ echo. set HYPRE_HOME=%INSTALLDIR% echo Hypre library version %LIB_TAG% built in %INSTALLDIR% echo. +echo ---------------------------------------------------------- +echo ---------------------------------------------------------- +echo cleaning fds build directory +echo ---------------------------------------------------------- +echo ---------------------------------------------------------- +echo. +cd %FDS_BUILDDIR% +git clean -dxf > Nul cd %CURDIR% diff --git a/Build/Scripts/SUNDIALS/build_sundials.bat b/Build/Scripts/SUNDIALS/build_sundials.bat index f2a5a2c8bbe..ef6752d5047 100644 --- a/Build/Scripts/SUNDIALS/build_sundials.bat +++ b/Build/Scripts/SUNDIALS/build_sundials.bat @@ -157,6 +157,14 @@ echo sundials version %LIB_TAG% installed in %INSTALLDIR% echo ---------------------------------------------------------- echo ---------------------------------------------------------- echo. +echo ---------------------------------------------------------- +echo ---------------------------------------------------------- +echo cleaning fds build directory +echo ---------------------------------------------------------- +echo ---------------------------------------------------------- +echo. +cd %FDS_BUILDDIR% +git clean -dxf > Nul cd %CURDIR% diff --git a/Build/Scripts/build_thirdparty_libs.bat b/Build/Scripts/build_thirdparty_libs.bat index 51d921d23d1..fe68f36c25b 100644 --- a/Build/Scripts/build_thirdparty_libs.bat +++ b/Build/Scripts/build_thirdparty_libs.bat @@ -2,6 +2,7 @@ set clean_hypre= set clean_sundials= +set FDS_BUILDDIR=%CD% call :getopts %* if %stopscript% == 1 exit /b From 7025183b9ebba5f7084149ab04a633bf88fca89f Mon Sep 17 00:00:00 2001 From: gforney Date: Sun, 3 Nov 2024 19:00:01 -0500 Subject: [PATCH 6/7] scripts: remove clean of fds build directory when building sundials and hypre libraries --- Build/Scripts/HYPRE/build_hypre.bat | 8 -------- Build/Scripts/SUNDIALS/build_sundials.bat | 8 -------- 2 files changed, 16 deletions(-) diff --git a/Build/Scripts/HYPRE/build_hypre.bat b/Build/Scripts/HYPRE/build_hypre.bat index 02168ce2f26..205cb519dfb 100644 --- a/Build/Scripts/HYPRE/build_hypre.bat +++ b/Build/Scripts/HYPRE/build_hypre.bat @@ -154,14 +154,6 @@ echo. set HYPRE_HOME=%INSTALLDIR% echo Hypre library version %LIB_TAG% built in %INSTALLDIR% echo. -echo ---------------------------------------------------------- -echo ---------------------------------------------------------- -echo cleaning fds build directory -echo ---------------------------------------------------------- -echo ---------------------------------------------------------- -echo. -cd %FDS_BUILDDIR% -git clean -dxf > Nul cd %CURDIR% diff --git a/Build/Scripts/SUNDIALS/build_sundials.bat b/Build/Scripts/SUNDIALS/build_sundials.bat index ef6752d5047..f2a5a2c8bbe 100644 --- a/Build/Scripts/SUNDIALS/build_sundials.bat +++ b/Build/Scripts/SUNDIALS/build_sundials.bat @@ -157,14 +157,6 @@ echo sundials version %LIB_TAG% installed in %INSTALLDIR% echo ---------------------------------------------------------- echo ---------------------------------------------------------- echo. -echo ---------------------------------------------------------- -echo ---------------------------------------------------------- -echo cleaning fds build directory -echo ---------------------------------------------------------- -echo ---------------------------------------------------------- -echo. -cd %FDS_BUILDDIR% -git clean -dxf > Nul cd %CURDIR% From 46b363438db1c7649e3d277333dfc1550900bbd5 Mon Sep 17 00:00:00 2001 From: gforney Date: Sun, 3 Nov 2024 20:55:20 -0500 Subject: [PATCH 7/7] scripts: minor formatting edits --- Build/Scripts/HYPRE/build_hypre.bat | 9 ++++++--- Build/Scripts/SUNDIALS/build_sundials.bat | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Build/Scripts/HYPRE/build_hypre.bat b/Build/Scripts/HYPRE/build_hypre.bat index 205cb519dfb..7034c3e05db 100644 --- a/Build/Scripts/HYPRE/build_hypre.bat +++ b/Build/Scripts/HYPRE/build_hypre.bat @@ -152,7 +152,7 @@ call make install echo. set HYPRE_HOME=%INSTALLDIR% -echo Hypre library version %LIB_TAG% built in %INSTALLDIR% +echo The Hypre library version %LIB_TAG% was built and installed in %INSTALLDIR% echo. cd %CURDIR% @@ -234,5 +234,8 @@ exit /b :eof echo. -if "%buildstatus%" == "norepo" echo Hypre library not built, The hypre git repo does not exist -if "%buildstatus%" == "prebuilt" echo Hypre library not built. It exists in %HYPRE_HOME% +echo. +if "%buildstatus%" == "norepo" echo The Hypre git repo does not exist, The Hypre library was not built. FDS will be built without it. +if "%buildstatus%" == "prebuilt" echo The Hypre library was not built. FDS will be built using the +if "%buildstatus%" == "prebuilt" echo Hypre library in %HYPRE_HOME% +echo. diff --git a/Build/Scripts/SUNDIALS/build_sundials.bat b/Build/Scripts/SUNDIALS/build_sundials.bat index f2a5a2c8bbe..bdf5ae9247d 100644 --- a/Build/Scripts/SUNDIALS/build_sundials.bat +++ b/Build/Scripts/SUNDIALS/build_sundials.bat @@ -153,9 +153,7 @@ echo setting SUNDIALS_HOME environment variable to %INSTALLDIR% set SUNDIALS_HOME=%INSTALLDIR% echo. -echo sundials version %LIB_TAG% installed in %INSTALLDIR% -echo ---------------------------------------------------------- -echo ---------------------------------------------------------- +echo The Sundials library version %LIB_TAG% was built and installed in %INSTALLDIR% echo. cd %CURDIR% @@ -237,5 +235,7 @@ exit /b :eof echo. -if "%buildstatus%" == "norepo" echo Sundials library not built, The sundials git repo does not exist -if "%buildstatus%" == "prebuilt" echo Sundials library not built. It exists in %SUNDIALS_HOME% +if "%buildstatus%" == "norepo" echo The Sundials git repo does not exist, The Sundials library was not built. FDS will be built without it. +if "%buildstatus%" == "prebuilt" echo The Sundials library was not built. FDS will be built using the +if "%buildstatus%" == "prebuilt" echo Sundials library in %SUNDIALS_HOME% +echo.