diff --git a/trunk/installParadiseo.sh b/trunk/installParadiseo.sh index 1479dba8b..dd6b46d8e 100755 --- a/trunk/installParadiseo.sh +++ b/trunk/installParadiseo.sh @@ -379,14 +379,17 @@ function run_install_step() echo -e " \033[40m\033[1;34m# STEP $currentStepCounter \033[0m " echo ' --> Installing Paradiseo-EO. Please wait ...' - execute_cmd "cd $installKitPath/paradiseo-eo" "[$currentStepCounter-1] Go in Paradiseo-EO dir" $SPY + execute_cmd "mkdir $installKitPath/build" "[$currentStepCounter-1] Create build directory" $SPY RETURN=`expr $RETURN + $?` - execute_cmd "./autogen.sh" "[$currentStepCounter-2] Run autogen" $SPY + execute_cmd "cd $installKitPath/build" "[$currentStepCounter-2] Go in Paradiseo-EO build dir" $SPY RETURN=`expr $RETURN + $?` - execute_cmd "./configure" "[$currentStepCounter-3] Run configure" $SPY + execute_cmd "cmake ../ " "[$currentStepCounter-3] Run CMake" $SPY RETURN=`expr $RETURN + $?` execute_cmd "make" "[$currentStepCounter-4] Compile ParadisEO-EO" $SPY RETURN=`expr $RETURN + $?` + execute_cmd "make install" "[$currentStepCounter-5] Make install of ParadisEO-EO" $SPY + RETURN=`expr $RETURN + $?` + if [ ! $(($RETURN)) = 0 ] then echo '' @@ -406,7 +409,7 @@ function run_install_step() execute_cmd "cd $installKitPath/paradiseo-mo/build" "[$currentStepCounter-1] Go in Paradiseo-MO dir" $SPY RETURN=$? - execute_cmd "cmake ../ -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake" $SPY + execute_cmd "cmake ../ -Dconfig=$installKitPath/install.cmake" "[$currentStepCounter-2] Run CMake" $SPY RETURN=`expr $RETURN + $?` execute_cmd "make" "[$currentStepCounter-3] Compile ParadisEO-MO" $SPY RETURN=`expr $RETURN + $?` @@ -431,7 +434,7 @@ function run_install_step() execute_cmd "cd $installKitPath/paradiseo-moeo/build" "[$currentStepCounter-1] Go in Paradiseo-MOEO dir" $SPY RETURN=$? - execute_cmd "cmake ../ -DEOdir=$installKitPath/paradiseo-eo" "[$currentStepCounter-2] Run CMake" $SPY + execute_cmd "cmake ../ -Dconfig=$installKitPath/install.cmake" "[$currentStepCounter-2] Run CMake" $SPY RETURN=`expr $RETURN + $?` execute_cmd "make" "[$currentStepCounter-3] Compile ParadisEO-MOEO" $SPY RETURN=`expr $RETURN + $?` @@ -669,7 +672,7 @@ function run_install_step() execute_cmd "cd $installKitPath/paradiseo-peo/build" "[$currentStepCounter-1] Go in Paradiseo-PEO dir" $SPY RETURN=$? - execute_cmd "cmake ../ -DEOdir=$installKitPath/paradiseo-eo/ -DMOdir=$installKitPath/paradiseo-mo" "[$currentStepCounter-2] Run CMake for ParadisEO-PEO" $SPY + execute_cmd "cmake ../ --Dconfig=$installKitPath/install.cmake" "[$currentStepCounter-2] Run CMake for ParadisEO-PEO" $SPY RETURN=`expr $RETURN + $?` execute_cmd "make" "[$currentStepCounter-3] Compile ParadisEO-PEO " $SPY RETURN=`expr $RETURN + $?`