X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install.sh;h=cd5bc068b823cbaedb3304ba9b0bbe60c86ef831;hb=2f000fc75240258c814526fec97b50d880183713;hp=651ca8dfaccd35d61a9319a9b628d2ca81b9e176;hpb=9495a9e60bcb36a39aea72dde0b067d4345fa808;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 651ca8d..cd5bc06 100644
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
  then 
    echo
@@ -45,7 +45,15 @@ binDir=$generationdir/thirdparty_bin
 if [ ! -e $generationdir ]
 then
    mkdir $generationdir
+   chown $loginUserName:$loginGroupName $generationdir
+fi
+if [ ! -e $sourcesDir ]
+then
    mkdir $sourcesDir
+fi
+
+if [ ! -e $binDir ]
+then
    mkdir $binDir
 fi
 
@@ -124,13 +132,17 @@ then
   rm -rf $sourcesDir/InsightToolkit*
   rm -rf $sourcesDir/gdcm*
   rm -rf $sourcesDir/tth*
+
+  rm -rf $binDir/gdcm*
+  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/VTK-5.6.1.patchCreatis.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/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 VTK-5.6.1.patchCreatis.tar.gz
   tar -xvzf gdcm_08_Dic_2009.tar.gz
   tar -xvzf InsightToolkit-3.20.0.tar.gz
 fi
@@ -144,12 +156,15 @@ else
 fi
 
 
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
 if [ true = true ]
 then
   libname=VTK
   dirInstall=$binDir/$libname-Bin
   dirInstallVTK=$dirInstall
   export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+  mkdir $dirInstall
   cd $dirInstall
  
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
@@ -161,6 +176,9 @@ then
   cd ..
 fi
 
+
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
 if [ true = true ]
 then
   libname=gdcm
@@ -178,6 +196,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
@@ -189,13 +209,15 @@ 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 ITK_USE_REVIEW: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
@@ -217,34 +239,32 @@ 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 ???)
-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 ???)
-echo source $installPrefixThird/share/creatools_third_party_library_config.sh >> /etc/bashrc 
+# - 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
 
+   sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
+   sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC
 
 
-
-
-#  modify .bashrc
-# - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)
-sed -i -e '/.*installPrefixCreaTools*/ d' ~/.bashrc
-sed -i -e '/.*creatools_base_library_config.*/ d' ~/.bashrc
-
-# - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' (with accurate value for ???)
-echo installPrefixCreaTools=$installPrefix >> ~/.bashrc
-
-echo '[ -f "$installPrefixCreaTools/share/creatools_base_library_config.sh" ] &&  source $installPrefixCreaTools/share/creatools_base_library_config.sh' >> ~/.bashrc 
+# - 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