X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install.sh;h=e2df511a37b6c945bcc8be5ccd0ef3260024752a;hb=ae34a7628ab81948a304cd4e7eaa7e759a047da8;hp=11d5ca0a943d3bbf5ceb198ac1b4eaae51060338;hpb=0dc1b0564e7ba236e6a045f0b0904a10f4d792a8;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 11d5ca0..e2df511 100644
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -19,6 +19,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo $PWD/scripts/CreaTools-configure.sh
    echo --generationdir--
    echo $generationdir
+   echo --corenumber--
+   echo $corenumber   
    echo --docgeneration--
    echo $docgeneration
    echo --installPrefix--
@@ -50,11 +52,13 @@ fi
 if [ ! -e $sourcesDir ]
 then
    mkdir $sourcesDir
+   chown $loginUserName:$loginGroupName $sourcesDir   
 fi
 
 if [ ! -e $binDir ]
 then
    mkdir $binDir
+   chown $loginUserName:$loginGroupName $binDir     
 fi
 
 
@@ -137,13 +141,13 @@ then
   rm -rf $binDir/InsightToolkit*
   rm -rf $binDir/VTK*
   cd $sourcesDir
-  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.6.1.tar.gz
-  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_08_Dic_2009.tar.gz
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
   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.tar.gz
-  tar -xvzf gdcm_08_Dic_2009.tar.gz
+  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
 fi
 
@@ -156,6 +160,8 @@ else
 fi
 
 
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
 if [ true = true ]
 then
   libname=VTK
@@ -169,12 +175,14 @@ then
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
-  make -j 2
+  make -j $corenumber
   make install
   cd ..
 fi
 
 
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
 if [ true = true ]
 then
   libname=gdcm
@@ -192,6 +200,8 @@ then
   cd ..
 fi
 
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
 if [ true = true ]
 then
   libname=InsightToolkit-3.20.0
@@ -202,14 +212,16 @@ then
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
-  cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
+  cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON -D ITK_USE_REVIEW_STATISTICS:BOOL=ON CMakeCache.txt
+  #uncomment following line if you want to use the bleeding edge of GDCM2!
+  #cmake -D ITK_USE_SYSTEM_GDCM:BOOL=ON CMakeCache.txt
   cmake CMakeCache.txt
   make -j 2
   make install
   cd ..
 fi
 
-
+#if [ true = false ]
 if [ true = true ]
 then
   cd $sourcesDir
@@ -231,37 +243,37 @@ fi
 touch     $installPrefixThird/share/creatools_third_party_library_config.sh
 chmod 755 $installPrefixThird/share/creatools_third_party_library_config.sh
 
-echo export PATH='$'PATH:$installPrefixThird/bin            	>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6         	>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export ITK_DIR=$installPrefixThird/lib/InsightToolkit  	>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export GDCM_DIR=$installPrefixThird/lib/gdcm            	>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export TTH=$installPrefixThird/bin/tth     		>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR  	>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR  	>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR   	>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export PATH='$'PATH:$installPrefixThird/bin           >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6        >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export ITK_DIR=$installPrefixThird/lib/InsightToolkit >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export GDCM_DIR=$installPrefixThird/lib/gdcm          >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export TTH=$installPrefixThird/bin/tth                >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 
 #  modify .bashrc
-# - remove line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
+# - remove line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
+
+# Install creatools as user (no longer as root) // JPR 2/5/2011
+#if [ ! -f /etc/bashrc ]
+#then
+#    export ETC_BASHRC="/etc/bash.bashrc"
+#else
+#    export ETC_BASHRC="/etc/bashrc"
+#fi
+
+export ETC_BASHRC=$HOME/.bashrc
 
-if [ ! -f /etc/bashrc ]
-then
-    echo
-    echo "You are probabely running under UBUNTU OS  ?"
-    echo "Troubles expected!"
-    echo
-    echo "Hit any key to continue"scripts/CreaTools-uninstall.sh
-    read a
-    echo export ETC_BASHRC="/etc/bash.bashrc"
-else
-    echo export ETC_BASHRC="/etc/bashrc"
-fi
    sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
    sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC
 
 
-# - add line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
+# - add line 'bash $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
 echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC
 echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> $ETC_BASHRC 
 
 
 
+ chown -R $loginUserName:$loginGroupName $generationdir
+