Commit fde52035 authored by François Fortin's avatar François Fortin
Browse files

-c parameter no longer do anything. setup.sh will always compile the METRo physic model

parent bdbe9efe
...@@ -45,7 +45,7 @@ installation_dir=`pwd` ...@@ -45,7 +45,7 @@ installation_dir=`pwd`
metro_dir=metro metro_dir=metro
bCompile=0 bCompile=1
sVerbose="" sVerbose=""
# 'getopts' processes command line args to script. # 'getopts' processes command line args to script.
...@@ -68,6 +68,8 @@ then ...@@ -68,6 +68,8 @@ then
echo "" echo ""
echo "-c : Will compile the METRo physic model instead of using" echo "-c : Will compile the METRo physic model instead of using"
echo " the provided binary. Need gfortran compiler." echo " the provided binary. Need gfortran compiler."
echo " DEPRECATED, no longer do anything, setup.sh will"
echo " always compile the METRo physic model."
echo "" echo ""
echo "-v : Verbose" echo "-v : Verbose"
echo "" echo ""
...@@ -89,6 +91,8 @@ do ...@@ -89,6 +91,8 @@ do
echo "" echo ""
echo "-c : Will compile the METRo physic model instead of using" echo "-c : Will compile the METRo physic model instead of using"
echo " the provided binary. Need gfortran compiler." echo " the provided binary. Need gfortran compiler."
echo " DEPRECATED, no longer do anything, setup.sh will"
echo " always compile the METRo physic model."
echo "" echo ""
echo "-v : Verbose" echo "-v : Verbose"
echo "" echo ""
...@@ -152,10 +156,10 @@ if [ $bCompile == 1 ]; then ...@@ -152,10 +156,10 @@ if [ $bCompile == 1 ]; then
../../scripts/do_macadam clean ../../scripts/do_macadam clean
../../scripts/do_macadam ../../scripts/do_macadam
cd $installation_dir cd $installation_dir
else #else
echo "* Use provided binary for physic model" # echo "* Use provided binary for physic model"
cp $sVerbose src/model/macadam.py.prebuilt $destination_path/usr/share/metro/model/macadam.py # cp $sVerbose src/model/macadam.py.prebuilt $destination_path/usr/share/metro/model/macadam.py
cp $sVerbose src/model/_macadam.so.prebuilt $destination_path/usr/lib/metro/_macadam.so # cp $sVerbose src/model/_macadam.so.prebuilt $destination_path/usr/lib/metro/_macadam.so
fi fi
echo "" echo ""
......
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