Commit b9db819b authored by yoogx's avatar yoogx

* Use sed to detect OCARINA_FLAGS

parent fef30568
...@@ -186,7 +186,7 @@ if test $# != 0 ; then ...@@ -186,7 +186,7 @@ if test $# != 0 ; then
;; ;;
--lcov|-l) --lcov|-l)
lcov -d . -c -o ocarina.gcov-info -t ocarina lcov -d . -c -o ocarina.gcov-info -t ocarina
genhtml -o html -s -f ocarina.gcov-info genhtml -o html -s -f ocarina.gcov-info
exit 0 exit 0
;; ;;
--clean|-c) --clean|-c)
...@@ -226,11 +226,11 @@ if test ${doprojects} = "true" ; then ...@@ -226,11 +226,11 @@ if test ${doprojects} = "true" ; then
if test $? != 0 ; then if test $? != 0 ; then
banner "Projects" FAILED banner "Projects" FAILED
failures=`expr ${failures} + 1` failures=`expr ${failures} + 1`
else else
passed ${entry} passed ${entry}
fi; fi;
cd ${old_dir} cd ${old_dir}
fi fi
...@@ -239,7 +239,7 @@ if test ${doall} = "true" ; then ...@@ -239,7 +239,7 @@ if test ${doall} = "true" ; then
if test $? != 0 ; then if test $? != 0 ; then
banner "Ocarina_Core" FAILED banner "Ocarina_Core" FAILED
failures=`expr ${failures} + 1` failures=`expr ${failures} + 1`
else else
banner "Ocarina_Core" PASSED banner "Ocarina_Core" PASSED
fi; fi;
...@@ -248,7 +248,7 @@ if test ${doall} = "true" ; then ...@@ -248,7 +248,7 @@ if test ${doall} = "true" ; then
if test $? != 0 ; then if test $? != 0 ; then
banner "Runtimes" FAILED banner "Runtimes" FAILED
failures=`expr ${failures} + 1` failures=`expr ${failures} + 1`
else else
banner "Runtimes" PASSED banner "Runtimes" PASSED
fi; fi;
...@@ -257,7 +257,7 @@ if test ${doall} = "true" ; then ...@@ -257,7 +257,7 @@ if test ${doall} = "true" ; then
if test $? != 0 ; then if test $? != 0 ; then
banner "Projects" FAILED banner "Projects" FAILED
failures=`expr ${failures} + 1` failures=`expr ${failures} + 1`
else else
banner "Projects" PASSED banner "Projects" PASSED
fi; fi;
...@@ -341,7 +341,7 @@ if test ${dotests} = "true" ; then ...@@ -341,7 +341,7 @@ if test ${dotests} = "true" ; then
real_lib_base=`dirname ${file}` real_lib_base=`dirname ${file}`
real_libs_nb=`ls ${real_lib_base} | grep "\.real" | wc -l` > /dev/null real_libs_nb=`ls ${real_lib_base} | grep "\.real" | wc -l` > /dev/null
if [ ${real_libs_nb} -gt 0 ] if [ ${real_libs_nb} -gt 0 ]
then then
real_lib=`dirname ${file}`/"*.real" real_lib=`dirname ${file}`/"*.real"
cp -f ${real_lib} . cp -f ${real_lib} .
...@@ -350,7 +350,7 @@ if test ${dotests} = "true" ; then ...@@ -350,7 +350,7 @@ if test ${dotests} = "true" ; then
flags=${default_flags} flags=${default_flags}
version=${default_version} version=${default_version}
if test -r ${manifest}; then if test -r ${manifest}; then
flags=`grep OCARINA_FLAGS ${manifest} | awk -F= '{print $2}'` flags=`grep OCARINA_FLAGS ${manifest} | sed 's/OCARINA_FLAGS=//'`
version=`grep AADL_VERSION ${manifest} | awk -F= '{print $2}'` version=`grep AADL_VERSION ${manifest} | awk -F= '{print $2}'`
flags=${flags:-${default_flags}} flags=${flags:-${default_flags}}
version=${version:-${default_version}} version=${version:-${default_version}}
......
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