Commit 9dc40ba9 authored by juan rodriguez-carvajal's avatar juan rodriguez-carvajal
Browse files

Changes of names of *.rsp files and adding the possibility of using gfortran with Winteracter.

parent 8a3d0242
Pipeline #12562 passed with stages
in 7 minutes and 27 seconds
...@@ -27,7 +27,8 @@ rem > Arguments ---- ...@@ -27,7 +27,8 @@ rem > Arguments ----
shift shift
if not [%1]==[] goto LOOP if not [%1]==[] goto LOOP
rem . rem .
rem Select the proper fpm.toml file depending on win rem Select the proper fpm.toml file depending on use for console of winteracter (two options com and win)
rem The console toml file construct also the executables in Program_Examples/...
rem . rem .
if [%_WINT%]==[win] ( if [%_WINT%]==[win] (
echo Copying .\toml\fpm_windows_win.toml to fpm.toml echo Copying .\toml\fpm_windows_win.toml to fpm.toml
...@@ -37,8 +38,10 @@ rem . ...@@ -37,8 +38,10 @@ rem .
copy .\toml\fpm_windows_con.toml fpm.toml copy .\toml\fpm_windows_con.toml fpm.toml
) )
) )
rem .
rem First change the extensions of files that are optionally used in fpm to "xxx" by rem First change the extensions of files that are optionally used in fpm to "xxx" by
rem invoking the tochange.bat script in the Src directory. rem invoking the tochange.bat script in the Src directory.
rem .
cd .\Src cd .\Src
if [%_WINT%]==[win] ( if [%_WINT%]==[win] (
call tochange xxx win call tochange xxx win
...@@ -47,7 +50,9 @@ cd .\Src ...@@ -47,7 +50,9 @@ cd .\Src
) )
) )
cd .. cd ..
rem .
rem Select now the compiles and execute the appropriate response file in rsp directory
rem .
if [%_COMP%]==[ifort] ( if [%_COMP%]==[ifort] (
cd .\Src cd .\Src
ren CFML_GlobalDeps_Windows_Intel.xxx CFML_GlobalDeps.f90 ren CFML_GlobalDeps_Windows_Intel.xxx CFML_GlobalDeps.f90
...@@ -60,23 +65,26 @@ cd .. ...@@ -60,23 +65,26 @@ cd ..
) )
) else ( ) else (
if [%_DEBUG%]==[Y] ( if [%_DEBUG%]==[Y] (
fpm @./rsp/ifort_debug fpm @./rsp/ifort_win_debug_con
) else ( ) else (
fpm @./rsp/ifort_release fpm @./rsp/ifort_win_release_con
) )
) )
cd .\Src cd .\Src
ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows_Intel.xxx ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows_Intel.xxx
cd .. cd ..
) )
rem .
rem With the compiler ifx only console modes are available
rem .
if [%_COMP%]==[ifx] ( if [%_COMP%]==[ifx] (
cd .\Src cd .\Src
ren CFML_GlobalDeps_Windows_Intel.xxx CFML_GlobalDeps.f90 ren CFML_GlobalDeps_Windows_Intel.xxx CFML_GlobalDeps.f90
cd .. cd ..
if [%_DEBUG%]==[Y] ( if [%_DEBUG%]==[Y] (
fpm @./rsp/ifx_debug fpm @./rsp/ifx_win_debug_con
) else ( ) else (
fpm @./rsp/ifx_release fpm @./rsp/ifx_win_release_con
) )
cd .\Src cd .\Src
ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows_Intel.xxx ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows_Intel.xxx
...@@ -86,10 +94,18 @@ cd .. ...@@ -86,10 +94,18 @@ cd ..
cd .\Src cd .\Src
ren CFML_GlobalDeps_Windows.xxx CFML_GlobalDeps.f90 ren CFML_GlobalDeps_Windows.xxx CFML_GlobalDeps.f90
cd .. cd ..
if [%_DEBUG%]==[Y] ( if [%_WINT%]==[win] (
fpm @./rsp/gf_debug if [%_DEBUG%]==[Y] (
fpm @./rsp/gf_debug_win
) else (
fpm @./rsp/gf_release_win
)
) else ( ) else (
fpm @./rsp/gf_release if [%_DEBUG%]==[Y] (
fpm @./rsp/gf_debug_con
) else (
fpm @./rsp/gf_release_con
)
) )
cd .\Src cd .\Src
ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows.xxx ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows.xxx
......
options install --prefix gfortran_debug
options --profile debug
options --compiler gfortran
options --flag "-Wno-conversion -Wno-character-truncation -Wno-maybe-uninitialized -fdec-math -fbacktrace -ffree-line-length-none -fall-intrinsics -static -I ../../wint/lib.gnu64/8.1"
options install --prefix gfortran_release
options --profile release
options --compiler gfortran
options --flag "-ffree-line-length-none -fdec-math -fall-intrinsics -static -I ../../wint/lib.gnu64/8.1"
options install --prefix ifx_debug options install --prefix ifx_debug
options --profile debug options --profile debug
options --compiler ifx options --compiler ifx
options --flag "-Warn:nointerfaces" options --flag "/Warn:nointerfaces /static /heap-arrays"
options install --prefix ifx_release options install --prefix ifx_release
options --profile release options --profile release
options --compiler ifx options --compiler ifx
options --flag "/static /heap-arrays /O2 /reentrancy:none"
...@@ -21,9 +21,6 @@ auto-examples = false ...@@ -21,9 +21,6 @@ auto-examples = false
[install] [install]
library = true library = true
#
# The lines above are enough for building the library using the scripts make_CrysFML_fpm.bat/make_CrysFML_fpm.sh # The lines above are enough for building the library using the scripts make_CrysFML_fpm.bat/make_CrysFML_fpm.sh
# #
#============================================================================================== #==============================================================================================
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment