Commit 137f1f0e authored by juan rodriguez-carvajal's avatar juan rodriguez-carvajal
Browse files

Merge branch 'testing-fpm' into 'master'

Adding a script for Windows to build all packages corresponding to the...

See merge request !26
parents 40ae11ba 6645a895
Pipeline #12569 passed with stages
in 6 minutes and 29 seconds
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo START BUILDING EVERYTHING
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo ..............................................................................
echo ..............................................................................
echo ... Building CrysFML and corresponding executables with gfortran in debug mode
echo ..............................................................................
echo ..............................................................................
call make_CrysFML_fpm gfortran debug
echo ................................................................................
echo ................................................................................
echo ... Building CrysFML and corresponding executables with gfortran in release mode
echo ................................................................................
echo ................................................................................
call make_CrysFML_fpm gfortran
echo ............................................................................
echo ............................................................................
echo ... Building CrysFML and corresponding executables with ifort in debug mode
echo ............................................................................
echo ............................................................................
call make_CrysFML_fpm ifort debug
echo ............................................................................
echo ............................................................................
echo ... Building CrysFML and corresponding executables with ifort in release mode
echo ............................................................................
echo ............................................................................
call make_CrysFML_fpm ifort
echo .....................................................................................
echo .....................................................................................
echo ..Building CrysFML and corresponding executables with ifort/winteracter in debug mode
echo .....................................................................................
echo .....................................................................................
call make_CrysFML_fpm ifort debug win
echo .....................................................................................
echo .....................................................................................
echo Building CrysFML and corresponding executables with ifort/winteracter in release mode
echo .....................................................................................
echo .....................................................................................
call make_CrysFML_fpm ifort win
rem For the moment ifx has some problems due to not yet implemented features in ifx
echo ............................................................................
echo ............................................................................
echo ... Building CrysFML and corresponding executables with ifx in debug mode
echo ............................................................................
echo ............................................................................
call make_CrysFML_fpm ifx debug
echo ............................................................................
echo ............................................................................
echo ... Building CrysFML and corresponding executables with ifx in release mode
echo ............................................................................
echo ............................................................................
call make_CrysFML_fpm ifx
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo STOP BUILDING EVERYTHING
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......@@ -27,7 +27,8 @@ rem > Arguments ----
shift
if not [%1]==[] goto LOOP
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 .
if [%_WINT%]==[win] (
echo Copying .\toml\fpm_windows_win.toml to fpm.toml
......@@ -37,8 +38,10 @@ rem .
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 invoking the tochange.bat script in the Src directory.
rem .
cd .\Src
if [%_WINT%]==[win] (
call tochange xxx win
......@@ -47,7 +50,9 @@ cd .\Src
)
)
cd ..
rem .
rem Select now the compiles and execute the appropriate response file in rsp directory
rem .
if [%_COMP%]==[ifort] (
cd .\Src
ren CFML_GlobalDeps_Windows_Intel.xxx CFML_GlobalDeps.f90
......@@ -60,23 +65,26 @@ cd ..
)
) else (
if [%_DEBUG%]==[Y] (
fpm @./rsp/ifort_debug
fpm @./rsp/ifort_win_debug_con
) else (
fpm @./rsp/ifort_release
fpm @./rsp/ifort_win_release_con
)
)
cd .\Src
ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows_Intel.xxx
cd ..
)
rem .
rem With the compiler ifx only console modes are available
rem .
if [%_COMP%]==[ifx] (
cd .\Src
ren CFML_GlobalDeps_Windows_Intel.xxx CFML_GlobalDeps.f90
cd ..
if [%_DEBUG%]==[Y] (
fpm @./rsp/ifx_debug
fpm @./rsp/ifx_win_debug_con
) else (
fpm @./rsp/ifx_release
fpm @./rsp/ifx_win_release_con
)
cd .\Src
ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows_Intel.xxx
......@@ -86,10 +94,18 @@ cd ..
cd .\Src
ren CFML_GlobalDeps_Windows.xxx CFML_GlobalDeps.f90
cd ..
if [%_DEBUG%]==[Y] (
fpm @./rsp/gf_debug
if [%_WINT%]==[win] (
if [%_DEBUG%]==[Y] (
fpm @./rsp/gf_debug_win
) else (
fpm @./rsp/gf_release_win
)
) else (
fpm @./rsp/gf_release
if [%_DEBUG%]==[Y] (
fpm @./rsp/gf_debug_con
) else (
fpm @./rsp/gf_release_con
)
)
cd .\Src
ren CFML_GlobalDeps.f90 CFML_GlobalDeps_Windows.xxx
......
#!/bin/bash
cd#!/bin/bash
#
#
# Attempt to create a unified build method for CrysFML using fmp
......@@ -89,9 +89,9 @@ cd ..
fi
else # Console mode (no dependencies, same for all OS)
if [ $DEBUG == "Y" ]; then
fpm @./rsp/ifort_debug
fpm @./rsp/ifort_lin_debug_con
else
fpm @./rsp/ifort_release
fpm @./rsp/ifort_lin_release_con
fi
fi
......@@ -115,9 +115,9 @@ cd ..
fi
else
if [ $DEBUG == "Y" ]; then
fpm @./rsp/ifx_debug
fpm @./rsp/ifx_lin_debug_con
else
fpm @./rsp/ifx_release
fpm @./rsp/ifx_lin_release_con
fi
fi
......@@ -141,9 +141,9 @@ cd ..
fi
else
if [ $DEBUG == "Y" ]; then
fpm @./rsp/gf_debug
fpm @./rsp/gf_debug_con
else
fpm @./rsp/gf_release
fpm @./rsp/gf_release_con
fi
fi
......
options install --prefix gfortran_debug
options --profile debug
options --compiler gfortran
options --flag "-ffree-line-length-none -static"
options --flag "-Wno-conversion -Wno-character-truncation -Wno-maybe-uninitialized -fdec-math -fbacktrace -ffree-line-length-none -fall-intrinsics -static"
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 -static"
options --flag "-ffree-line-length-none -fdec-math -fall-intrinsics -static"
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 ifort_debug
options --profile debug
options --compiler ifort
\ No newline at end of file
options install --prefix ifort_debug_win
options --profile debug
options --compiler ifort
options --flags "-I ../../../../usr/local/wint/lib.i64"
\ No newline at end of file
options --flag "-I ../../../../usr/local/wint/lib.i64"
\ No newline at end of file
options install --prefix ifort_release
options --compiler ifort
options --flag "-O2 -heap-arrays -nologo"
option --profile release
options install --prefix ifort_release_win
options --profile release
options --compiler ifort
options --flags "-I ../../../../usr/local/wint/lib.i64"
\ No newline at end of file
options --flag "-O2 -heap-arrays -nologo -I ../../../../usr/local/wint/lib.i64"
option --profile release
options install --prefix ifort_debug_win
options --profile debug
options --compiler ifort
options --flags "-I ../../wint/lib.i64"
\ No newline at end of file
options --flag "-I ../../wint/lib.i64"
\ No newline at end of file
options install --prefix ifort_release
options --compiler ifort
options --flag "/static /heap-arrays /O3 /reentrancy:none"
options --profile release
options --compiler ifort
\ No newline at end of file
options install --prefix ifort_release_win
options --profile release
options --compiler ifort
options --flags "-I ../../wint/lib.i64"
\ No newline at end of file
options --flag "-I ../../wint/lib.i64"
\ No newline at end of file
options install --prefix ifx_debug
options --profile debug
options --compiler ifx
options --flags "-Warn:nointerfaces"
options --flag "-Warn:nointerfaces -static -heap-arrays"
options install --prefix ifx_release
options --profile release
options --compiler ifx
options --flag "-static -heap-arrays -O2 -reentrancy:none"
options install --prefix ifx_debug
options --profile debug
options --compiler ifx
options --flag "/Warn:nointerfaces /static /heap-arrays"
options install --prefix ifx_release
options --profile release
options --compiler ifx
options --flag "/static /heap-arrays /O2 /reentrancy:none"
......@@ -11,7 +11,10 @@ copyright = "Copyright 2022, Juan Rodriguez-Carvajal, Javier Gonzalez-Platas, Ne
[library]
source-dir = "Src"
# ifort/ifx
include-dir = "../../../../usr/local/wint/lib.i64"
# gfortran
#include-dir = "../../../../usr/local/wint/lib.gnu64/8.3"
[build]
auto-executables = false
......
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