diff --git a/install b/install index aa9e7e38e65c66890a0c6931630ae23a9a9e6c09..e71617c3f538b6ec86a102bb01be6b5199e324f3 100755 --- a/install +++ b/install @@ -4,6 +4,7 @@ source script/help source script/discover_os source script/show_solutions source script/pre_req +source script/remove_old ## @@ -39,6 +40,10 @@ done discover_os +## Remove old dependencies and installations + +remove_old $i_dir + ## Check and try to install the prerequisites pre_req diff --git a/openfpm_data b/openfpm_data index 8055e4edb15d5b4bf2ea12b5b64186a46203f378..5e0680ec6f7e0e39269356315571ac0580caad35 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit 8055e4edb15d5b4bf2ea12b5b64186a46203f378 +Subproject commit 5e0680ec6f7e0e39269356315571ac0580caad35 diff --git a/openfpm_io b/openfpm_io index 7988298e26138d0470851e9053e6640511793363..fd5290c92c6d87ce63890a4e591c0d1c2e98ced2 160000 --- a/openfpm_io +++ b/openfpm_io @@ -1 +1 @@ -Subproject commit 7988298e26138d0470851e9053e6640511793363 +Subproject commit fd5290c92c6d87ce63890a4e591c0d1c2e98ced2 diff --git a/openfpm_vcluster b/openfpm_vcluster index d209394f00b1fe089f8c473465fd29da78a5ba48..24fb89ec03a51ac994152ad39a28bf3bb780c129 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit d209394f00b1fe089f8c473465fd29da78a5ba48 +Subproject commit 24fb89ec03a51ac994152ad39a28bf3bb780c129 diff --git a/script/install_BOOST.sh b/script/install_BOOST.sh index 6d0daab43ee20f4de5110b683249e6c25c179589..a396bd59a0a28a7090824551d4fd04e75bf27fe3 100755 --- a/script/install_BOOST.sh +++ b/script/install_BOOST.sh @@ -8,8 +8,8 @@ if [ -d "$1/BOOST" ]; then fi wget http://ppmcore.mpi-cbg.de/upload/boost_1_58_0.tar.bz2 -tar -xvf boost_1_58_0.tar.bz2 -cd boost_1_58_0 +tar -xvf boost_1_60_0.tar.bz2 +cd boost_1_60_0 ./bootstrap.sh mkdir $1/BOOST ./b2 -j 4 install --prefix=$1/BOOST diff --git a/script/remove_old b/script/remove_old new file mode 100755 index 0000000000000000000000000000000000000000..f8797c5d7998e128e9f3d1ce8f5bd49602845874 --- /dev/null +++ b/script/remove_old @@ -0,0 +1,92 @@ +#! /bin/bash + +function remove_old() +{ + ## Get the previos openFPM installation + previous_inst=$(cat $PWD/install_dir) + + if [ x"$previous_inst"!=x"" ]; then + echo "Found previous installation" + if [ -d "$previous_inst/openfpm_pdata" ]; then + echo "Removing the folder: $previous_inst/openfpm_pdata" + rm -rf "$previous_inst/openfpm_pdata" + if [ -d "$previous_inst/openfpm_pdata" ]; then + echo -e "\033[91;5;1m Remove failed, manually remove the folder $previous_inst/openfpm_pdata, I am waiting ... \033[0m" + fi + while [ -d "$previous_inst/openfpm_pdata" ] + do + sleep 1 + done + echo "Thanks" + fi + + if [ -d "$previous_inst/openfpm_data" ]; then + echo "Removing the folder: $previous_inst/openfpm_data" + rm -rf "$previous_inst/openfpm_data" + if [ -d "$previous_inst/openfpm_data" ]; then + echo -e "\033[91;5;1m Remove failed, manually remove the folder $previous_inst/openfpm_data, I am waiting ... \033[0m" + fi + while [ -d "$previous_inst/openfpm_data" ] + do + sleep 1 + done + echo "Thanks" + fi + + if [ -d "$previous_inst/openfpm_devices" ]; then + echo "Removing the folder: $previous_inst/openfpm_devices" + rm -rf "$previous_inst/openfpm_devices" + if [ -d "$previous_inst/openfpm_devices" ]; then + echo -e "\033[91;5;1m Remove failed, manually remove the folder $previous_inst/openfpm_devices, I am waiting ... \033[0m" + fi + while [ -d "$previous_inst/openfpm_devices" ] + do + sleep 1 + done + echo "Thanks" + fi + + if [ -d "$previous_inst/openfpm_io" ]; then + echo "Removing the folder: $previous_inst/openfpm_io" + rm -rf "$previous_inst/openfpm_io" + if [ -d "$previous_inst/openfpm_io" ]; then + echo -e "\033[91;5;1m Remove failed, manually remove the folder $previous_inst/openfpm_io, I am waiting ... \033[0m" + fi + while [ -d "$previous_inst/openfpm_io" ] + do + sleep 1 + done + echo "Thanks" + fi + + if [ -d "$previous_inst/openfpm_vcluster" ]; then + echo "Removing the folder: $previous_inst/openfpm_vcluster" + rm -rf "$previous_inst/openfpm_vcluster" + if [ -d "$previous_inst/openfpm_vcluster" ]; then + echo -e "\033[91;5;1m Remove failed, manually remove the folder $previous_inst/openfpm_vcluster, I am waiting ... \033[0m" + fi + while [ -d "$previous_inst/openfpm_vcluster" ] + do + sleep 1 + done + echo "Thanks" + fi + fi + + ## Check the installed version of the dependencies + + if [ -f $1/BOOST/include/boost/version.hpp ]; then + is_update=$(cat $1/BOOST/include/boost/version.hpp | grep "#define BOOST_VERSION 106000") + if [ x"$is_update"==x"" ]; then + echo "New boost version, removing the old one" + rm -rf $1/BOOST/include + rm -rf $1/BOOST/lib + fi + fi + + +} + +remove_old "/home/i-bird" + +