X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install.sh;h=187ffd313293d6042781c32883bf3b07e62e7069;hb=6a4393e29e2ad4c755ff2d31d53e0f9823ddd1bd;hp=1db579a4e854aa3a577158071a53ee929aa28f2d;hpb=87c77aeffdac15c0f3386a9e0ce7d4769825c7d8;p=creaToolsTools.git diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh index 1db579a..187ffd3 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-- @@ -42,7 +43,6 @@ source $PWD/scripts/CreaTools-configure.sh # echo $start_point echo "------" - scriptDir=$PWD sourcesDir=$generationdir/thirdparty_sources binDir=$generationdir/thirdparty_bin @@ -71,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 @@ -117,11 +113,11 @@ else debug="OFF" fi - #if [ true = false ] if [ true = true ] then cd $sourcesDir # pourquoi ne copie-t-on plus? JPR + mkdir -p $installPrefixThird/bin cp tth $installPrefixThird/bin fi