diff --git a/build/with_fcm/README.md b/build/with_fcm/README.md
index 66339de0fada5d8e64e27c8fd152f82fab0d6a5e..a8f26bac80ac0148b2c86e33ecc048d35ccbfbf8 100644
--- a/build/with_fcm/README.md
+++ b/build/with_fcm/README.md
@@ -39,4 +39,21 @@ The env file is sourced juste before the compilation step (for loading modules f
before populating the build directory with the source code.
Indeed, during this second step, the source code is copied or cloned and transformed by the pyft\_tool.py script.
The active transformations are controlled by the --noexpand/--expand options given to the
-different check\_commit\_\* scripts and by the PYFT\_OPTS that can be set in the env file.
+different check\_commit\_\* scripts and by the PYFT\_OPTS that can be set in the env file (only for testprogs).
+
+If the environment variable is a multi-lines string, each line must take the form
+> FILE\_DESCRIPTOR:OPTIONS
+where FILE\_DESCRIPTOR is regular expression to test against the filename. If there
+is a match, the OPTIONS can be used for the file. The last matching FILE\_DESCRIPTOR
+is used. The regular expression is tested using 'grep -e'. If a line doesn't contain
+the FILE\_DESCRIPTOR part, it applies to all source code.
+
+For example, to transform all source code in lower case:
+> export OPTS='--lowerCase'; $0 --pyft\_opts\_env OPTS ...
+
+To transform all source code in lower case, except routines in turb directory which must be
+in upper case but keeping the turb.F90 in lower case:
+> export OPTS='--lowerCase
+> ^turb/:--upperCase
+> ^turb/turb\..90:--lowerCase'; $0 --pyft\_opts\_env OPTS ...
+
diff --git a/build/with_fcm/make_fcm.sh b/build/with_fcm/make_fcm.sh
index 109dfa1aa8df523f35b8a992089687604cf405c7..3c037d95294bb1c4943cb750f1acab2a020db421 100755
--- a/build/with_fcm/make_fcm.sh
+++ b/build/with_fcm/make_fcm.sh
@@ -344,6 +344,7 @@ if [ $packcreation -eq 1 ]; then
cp fcm-make.cfg $builddir
cd $builddir
. arch.env
+ export PYFT_OPTS
# Populate the source directory with (modified) PHYEX source code
[ "$commit" == "" ] && commit=$PWD/../../.. #Current script run from within a PHYEX repository
@@ -367,15 +368,15 @@ if [ $packcreation -eq 1 ]; then
if [ "$fromdir" == '' ]; then
echo "Clone repository, and checkout commit $commit (using prep_code.sh)"
if [[ $commit == testprogs${separator}* ]]; then
- PATH=$UPDATEDPATH prep_code.sh -c $commit src -- $PYFT_OPTS #This commit is ready for inclusion
+ PATH=$UPDATEDPATH prep_code.sh -c --pyft_opts_env PYFT_OPTS $commit src #This commit is ready for inclusion
else
- PATH=$UPDATEDPATH prep_code.sh -c $commit $expand_options $subs -m testprogs src -- $PYFT_OPTS
+ PATH=$UPDATEDPATH prep_code.sh -c --pyft_opts_env PYFT_OPTS $commit $expand_options $subs -m testprogs src
fi
else
echo "Copy $fromdir"
mkdir src
scp -q -r $fromdir/src src/
- PATH=$UPDATEDPATH prep_code.sh $expand_options $subs -m testprogs src -- $PYFT_OPTS
+ PATH=$UPDATEDPATH prep_code.sh --pyft_opts_env PYFT_OPTS $expand_options $subs -m testprogs src
fi
# Add some code
diff --git a/tools/check_commit_ial.sh b/tools/check_commit_ial.sh
index 5cb1c29d1aad6228b17bf0ba2d36fa45faecd183..e14040108f87b72068f15b6bc697cc22b57a9d47 100755
--- a/tools/check_commit_ial.sh
+++ b/tools/check_commit_ial.sh
@@ -115,7 +115,7 @@ mainPackVersion=${mainPackVersion:-${defaultMainPackVersion}}
################################
function usage {
- echo "Usage: $0 [-h] [-p] [-c] [-r] [-C] [-s] [-f] [--noexpand] [-t TEST] [--cycle CYCLE] [--scripttag TAG] [--repo-user USER] [--repo-protocol PROTOCOL] [--remove] [--onlyIfNeeded] [--computeRefIfNeeded] commit [reference]"
+ echo "Usage: $0 [-h] [-p] [-c] [-r] [-C] [-s] [-f] [--noexpand] [-t TEST] [--cycle CYCLE] [--scripttag TAG] [--repo-user USER] [--repo-protocol PROTOCOL] [--remove] [--onlyIfNeeded] [--computeRefIfNeeded] [--prep_code-opts 'OPTS'] commit [reference]"
echo "commit commit hash (or a directory, or among $specialPack) to test"
echo "reference commit hash (or a directory, or among $specialPack) REF to use as a reference"
echo "-s suppress compilation pack"
@@ -140,6 +140,10 @@ function usage {
echo " only if the step has not already been done"
echo "--computeRefIfNeeded"
echo " computes the missing references"
+ echo "--prep_code-opts 'OPTS'"
+ echo " OPTS is added to the call to prep_code (e.g. --prep_code_opts '--lowerCase'"
+ echo " to transfor all source codes in lower case). Help on prep_code.sh options"
+ echo " can be found with 'prep_code.sh -h'. Note: don't forget to enclose OPTS in ' or \""
echo ""
echo "If nothing is asked (pack creation, compilation, running, check, removing) everything"
echo "except the removing is done"
@@ -173,6 +177,7 @@ scripttag=''
remove=0
onlyIfNeeded=0
computeRefIfNeeded=0
+prepCodeOpts=""
while [ -n "$1" ]; do
case "$1" in
@@ -192,7 +197,7 @@ while [ -n "$1" ]; do
'--remove') remove=1;;
'--onlyIfNeeded') onlyIfNeeded=1;;
'--computeRefIfNeeded') computeRefIfNeeded=1;;
-
+ '--prep_code-opts') prepCodeOpts=$2; shift;;
#--) shift; break ;;
*) if [ -z "${commit-}" ]; then
commit=$1
@@ -502,15 +507,15 @@ if [ $packcreation -eq 1 ]; then
if [ "$fromdir" == '' ]; then
echo "Clone repository, and checkout commit $commit (using prep_code.sh)"
if [[ $commit == arome${separator}* ]]; then
- $prep_code -c $commit PHYEX #This commit is ready for inclusion
+ $prep_code $prepCodeOpts -c $commit PHYEX #This commit is ready for inclusion
else
- $prep_code -c $commit $expand_options $subs -m arome PHYEX
+ $prep_code $prepCodeOpts -c $commit $expand_options $subs -m arome PHYEX
fi
else
echo "Copy $fromdir"
mkdir PHYEX
scp -q -r $fromdir/src PHYEX/
- $prep_code $expand_options $subs -m arome PHYEX
+ $prep_code $prepCodeOpts $expand_options $subs -m arome PHYEX
fi
find PHYEX -type f -exec touch {} \; #to be sure a recompilation occurs
for rep in turb micro conv aux; do
diff --git a/tools/check_commit_mesonh.sh b/tools/check_commit_mesonh.sh
index 89a6ca82ff9eb03b88e41291a5c516b006326ce4..4155612d5f6b04a43aa3dcbbd136cd6333276cdd 100755
--- a/tools/check_commit_mesonh.sh
+++ b/tools/check_commit_mesonh.sh
@@ -42,7 +42,7 @@ TARGZDIR=${TARGZDIR:=$PHYEXTOOLSDIR/pack/}
################################
function usage {
- echo "Usage: $0 [-h] [-p] [-c] [-r] [-C] [-s] [--expand] [-t TEST] [--repo-user USER] [--repo-protocol PROTOCOL] [--remove] [--onlyIfNeeded] [--computeRefIfNeeded] commit [reference]"
+ echo "Usage: $0 [-h] [-p] [-c] [-r] [-C] [-s] [--expand] [-t TEST] [--repo-user USER] [--repo-protocol PROTOCOL] [--remove] [--onlyIfNeeded] [--computeRefIfNeeded] [--prep_code-opts 'OPTS'] commit [reference]"
echo "commit commit hash (or a directory) to test"
echo "reference commit hash or a directory or nothing for ref"
echo "-s suppress compilation pack"
@@ -64,6 +64,10 @@ function usage {
echo " only if the step has not already been done"
echo "--computeRefIfNeeded"
echo " computes the missing references"
+ echo "--prep_code-opts 'OPTS'"
+ echo " OPTS is added to the call to prep_code (e.g. --prep_code_opts '--lowerCase'"
+ echo " to transfor all source codes in lower case). Help on prep_code.sh options"
+ echo " can be found with 'prep_code.sh -h'. Note: don't forget to enclose OPTS in ' or \""
echo ""
echo "If nothing is asked (pack creation, compilation, running, check, removing) everything"
echo "except the removing is done"
@@ -90,6 +94,7 @@ useexpand=0
remove=0
onlyIfNeeded=0
computeRefIfNeeded=0
+prepCodeOpts=""
while [ -n "$1" ]; do
case "$1" in
@@ -106,7 +111,7 @@ while [ -n "$1" ]; do
'--remove') remove=1;;
'--onlyIfNeeded') onlyIfNeeded=1;;
'--computeRefIfNeeded') computeRefIfNeeded=1;;
-
+ '--prep_code-opts') prepCodeOpts=$2; shift;;
#--) shift; break ;;
*) if [ -z "${commit-}" ]; then
commit=$1
@@ -273,15 +278,15 @@ if [ $packcreation -eq 1 ]; then
if [ "$fromdir" == '' ]; then
echo "Clone repository, and checkout commit $commit (using prep_code.sh)"
if [[ $commit == mesonh${separator}* ]]; then
- $prep_code --renameFf --ilooprm -c $commit PHYEX #This commit is ready for inclusion
+ $prep_code $prepCodeOpts --renameFf --ilooprm -c $commit PHYEX #This commit is ready for inclusion
else
- $prep_code --renameFf --ilooprm -c $commit $expand_options $subs -m mesonh PHYEX
+ $prep_code $prepCodeOpts --renameFf --ilooprm -c $commit $expand_options $subs -m mesonh PHYEX
fi
else
echo "Copy $fromdir"
mkdir PHYEX
scp -q -r $fromdir/src PHYEX/
- $prep_code --renameFf --ilooprm $expand_options $subs -m mesonh PHYEX
+ $prep_code $prepCodeOpts --renameFf --ilooprm $expand_options $subs -m mesonh PHYEX
fi
rm -rf PHYEX/.git
find PHYEX -type f -exec touch {} \; #to be sure a recompilation occurs
diff --git a/tools/prep_code.sh b/tools/prep_code.sh
index fb9e49651f46115db2e621b4504187f637535a88..92702aedcef2473399eeb7cbfb3cdda8388fed03 100755
--- a/tools/prep_code.sh
+++ b/tools/prep_code.sh
@@ -16,7 +16,8 @@ PHYEXTOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
###### COMMAND LINE ARGUMENTS
function usage {
echo "Usage: $0 [-h] [-c CHECKOUT_POINT] [-m MODEL] [-D OPTION [-D OPTION [...]]]] \\"
- echo " [-s SUBDIR [-s SUBDIR [...]]] [-v [-v [-v]]] DIRECTORY -- PYFT_OPTIONS"
+ echo " [-s SUBDIR [-s SUBDIR [...]]] [--pyft_opts_env VAR] [-v [-v [-v]]] \\"
+ echo " DIRECTORY -- PYFT_OPTIONS"
echo "DIRECTORY directory containing the script result"
echo "-c CHECKOUT_POINT git object to checkout, can be a specific commit"
echo " or a tag with the following syntax: tags/TAG where TAG is the tag name"
@@ -29,6 +30,10 @@ function usage {
echo "--repo use this repository instead of the one derived (if any) from the env variables"
echo " PHYEXREPOuser (=$PHYEXREPOuser) and PHYEXREPOprotocol (=$PHYEXREPOprotocol)"
echo "-v add verbosity (up to 3 -v)"
+ echo "--pyft_opts_env VAR name of an environment variable containing options to use to call"
+ echo " the pyft_tool.py script"
+ echo "-- PYFT_OPTIONS everything after '--' are used as options for pyft_tool.py"
+ echo " These options are used for all the files."
echo ""
echo "* If the -c option is not provided, DIRECTORY must already contain files and directory as if"
echo " it was the result of a git checkout"
@@ -40,6 +45,25 @@ function usage {
echo "Everything after the '--' is passed to pyft for source-to-source transformation"
echo ""
echo "To use the pyft tool... it must be installed"
+ echo ""
+ echo "The variable name sent with --pyft_opts_env must correspond to an exported environement"
+ echo "variable. This variable can be a one-line string or a multi-line string. In case of a one-line"
+ echo "string, the string is added to the call to pyft_tool.py script for each file."
+ echo "If the environment variable is a multi-lines string, each line must take the form"
+ echo "FILE_DESCRIPTOR:OPTIONS"
+ echo "where FILE_DESCRIPTOR is regular expression to test against the filename. If there"
+ echo "is a match, the OPTIONS can be used for the file. The last matching FILE_DESCRIPTOR"
+ echo "is used. The regular expression is tested using 'grep -e'. If a line doesn't contain"
+ echo "the FILE_DESCRIPTOR part, it applies to all source code."
+ echo ""
+ echo "For example, to transform all source code in lower case:"
+ echo "export OPTS='--lowerCase'; $0 --pyft_opts_env OPTS ..."
+ echo ""
+ echo "To transform all source code in lower case, except routines in turb directory which must be"
+ echo "in upper case but keeping the turb.F90 in lower case:"
+ echo "export OPTS='--lowerCase"
+ echo "^turb/:--upperCase"
+ echo "^turb/turb\..90:--lowerCase'; $0 --pyft_opts_env OPTS ..."
}
full_command="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}") $@"
@@ -56,6 +80,7 @@ renameFf=0
verbose=0
ilooprm=0
forpyft=0
+pyft_opts_env=""
if [ -z "${PHYEXREPOprotocol-}" ]; then
repository=""
@@ -71,7 +96,7 @@ fi
while [ -n "$1" ]; do
case "$1" in
- '-h') usage;;
+ '-h') usage; exit;;
'-c') checkout_point="$2"; shift;;
'-m') model="$2"; shift;;
'--mnhExpand') pyft_options="$pyft_options $1";;
@@ -81,6 +106,7 @@ while [ -n "$1" ]; do
'--ilooprm') ilooprm=1;;
'--repo') repository=$2; shift;;
'-v') verbose=$(($verbose+1));;
+ '--pyft_opts_env') pyft_opts_env=$2; shift;;
'--') forpyft=1;;
*) if [ $forpyft -eq 0 ]; then
directory="$1"
@@ -91,6 +117,11 @@ while [ -n "$1" ]; do
shift
done
+if [ "$pyft_opts_env" != "" ]; then
+ #pyft_opts_env contains the name of the environment variable to use
+ pyft_opts_env=${!pyft_opts_env}
+ #now, pyft_opts_env contains the configuration to use
+fi
if [ $verbose -ge 3 ]; then
set -x
fi
@@ -252,7 +283,7 @@ if [ $ilooprm -eq 1 ]; then
fi
###### PYFT
-if [ -n "${pyft_options-}" ]; then
+if [ "$pyft_opts_env" != "" -o -n "${pyft_options-}" ]; then
[ $verbose -gt 0 ] && echo "Applying pyft_tool"
#Update PATH and PYTHONPATH if needed
@@ -272,7 +303,25 @@ if [ -n "${pyft_options-}" ]; then
if [ "$(echo $file | grep '\.')" != '' -a $(echo $file | rev | cut -d. -f1 | rev) != 'fypp' ]; then
#Files without extension are certainly not source code files
#.fypp files cannot be read by pyft_tool.py
- pyft_tool.py --wrapH $pyft_options "$file" #--wrapH allows to deal with h files
+ extra_opts=""
+ if [ "$pyft_opts_env" != "" ]; then
+ while read line; do
+ if echo $line | grep ':' > /dev/null; then
+ #This line has the form FILE_DESCRIPTOR:OPTIONS
+ fd=$(echo $line | cut -d: -f1)
+ if echo $file | grep -e $fd > /dev/null; then
+ extra_opts=$(echo $line | cut -d: -f2-)
+ fi
+ else
+ extra_opts=$line
+ fi
+ done < <(echo "$pyft_opts_env")
+ fi
+ if [ "$extra_opts" != "" -o -n "${pyft_options-}" ]; then
+ cmd="pyft_tool.py --wrapH $pyft_options $extra_opts" #--wrapH allows to deal with h files
+ [ $verbose -gt 1 ] && echo $cmd "$file"
+ $cmd "$file"
+ fi
fi
done
fi