nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deleted LAST_RETURN error (peo) + took build removals into account when uninstall

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1110 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
legrand 2008-03-11 16:08:04 +00:00
commit eeb59ad7af
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trunk/installParadiseo.sh
View file

@ -497,6 +497,8 @@ function run_install_step()
if [ "$COMPILE_PARADISEO" = "1" ]
then
execute_cmd "ctest $CTEST_CONFIG" "[$currentStepCounter-3] Compile ParadisEO-MOEO using CTest" $SPY
LAST_RETURN=$?
# don't consider a submission error as a "right error"
if [ ! "$LAST_RETURN" = "$DART_SUBMISSION_ERROR" ]
then
RETURN=`expr $RETURN + $LAST_RETURN`
@ -667,10 +669,19 @@ function run_install_step()
fi
idx=`expr $idx + $?`
execute_cmd "rm -Rf $installKitPath/paradiseo-eo/build/*" "[$currentStepCounter] Remove $installKitPath/paradiseo-eo/build/* $SPY
idx=`expr $idx + $?`
execute_cmd "rm -Rf $installKitPath/paradiseo-mo/build/*" "[$currentStepCounter] Remove $installKitPath/paradiseo-mo/build/* $SPY
idx=`expr $idx + $?`
execute_cmd "rm -Rf $installKitPath/paradiseo-moeo/build/*" "[$currentStepCounter] Remove $installKitPath/paradiseo-moeo/build/* $SPY
idx=`expr $idx + $?`
execute_cmd "rm -Rf $installKitPath/paradiseo-peo/build/*" "[$currentStepCounter] Remove $installKitPath/paradiseo-peo/build/* $SPY
idx=`expr $idx + $?`
if [ ! $(($idx)) = 0 ]
then
echo ''
echo " --> Error when removing previous install of libxml2 and mpich2"
echo " --> Error when removing previous install of ParadisEO"
echo -e ' \033[40m\033[1;33m### END ### \033[0m '
return $RM_UTIL_ERROR
else
@ -791,6 +802,8 @@ function run_install_step()
if [ "$COMPILE_PARADISEO" = "1" ]
then
execute_cmd "ctest $CTEST_CONFIG" "[$currentStepCounter-3] Compile ParadisEO-PEO using CTest" $SPY
LAST_RETURN=$?
# don't consider a submission error as a "right error"
if [ ! "$LAST_RETURN" = "$DART_SUBMISSION_ERROR" ]
then
RETURN=`expr $RETURN + $LAST_RETURN`