X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install.sh;h=c06dd1e8a428ac3671cae6dda42b3ae10628c0e7;hb=42a2882bd2ad34aa34b2b4dec6a3d2939ffe8454;hp=3b71a4707e2717b665ad8059ed7926ee6dbbc9ae;hpb=9855e3b70d5b519d697d6eba6d462118565c3698;p=creaToolsTools.git diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh index 3b71a47..c06dd1e 100644 --- a/Linux/scripts/ThirdParty-install.sh +++ b/Linux/scripts/ThirdParty-install.sh @@ -1,4 +1,5 @@ #!/bin/bash + if [ ! -f $PWD/scripts/CreaTools-configure.sh ] then echo @@ -11,7 +12,7 @@ echo echo exit 0 -fi +fi echo $loginGroupName source $PWD/scripts/CreaTools-configure.sh @@ -21,7 +22,7 @@ source $PWD/scripts/CreaTools-configure.sh echo --generationdir-- echo $generationdir echo --corenumber-- - echo $corenumber + echo $corenumber echo --docgeneration-- echo $docgeneration echo --installPrefix-- @@ -32,6 +33,8 @@ source $PWD/scripts/CreaTools-configure.sh echo $buildType echo --gdcmVersion-- echo $gdcmVersion + echo "--ETC_BASHRC--" + echo $ETC_BASHRC # echo --sourcesFrom-- # echo $sourcesFrom # echo --scriptDir-- @@ -40,7 +43,6 @@ source $PWD/scripts/CreaTools-configure.sh # echo $start_point echo "------" - scriptDir=$PWD sourcesDir=$generationdir/thirdparty_sources binDir=$generationdir/thirdparty_bin @@ -50,8 +52,8 @@ then mkdir $generationdir chown $loginUserName $generationdir chgrp $loginGroupName $generationdir - fi + if [ ! -e $sourcesDir ] then mkdir $sourcesDir @@ -69,23 +71,19 @@ then fi - # Third Party base stuff is now installed by ThirdParty-install-Base-Stuff.sh JPR - - # the following stupid test is used at debug time; Please don't remove! #if [ true = false ] if [ true = true ] then - rm -rf $sourcesDir/tth* cd $sourcesDir - if [ $OperatingSystem = "MacOS" ] - then + if [ $OperatingSystem = "MacOS" ] + then # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz @@ -101,8 +99,8 @@ then wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth # tar -xvzf VTK-5.6.1.patchCreatis.tar.gz - #tar -xvzf gdcm_05_Mai_2011.tar.gz - #tar -xvzf InsightToolkit-3.20.0.tar.gz + #tar -xvzf gdcm_05_Mai_2011.tar.gz + #tar -xvzf InsightToolkit-3.20.0.tar.gz fi fi @@ -115,7 +113,6 @@ else debug="OFF" fi - #if [ true = false ] if [ true = true ] then