X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install.sh;h=2f4fdaf100511aea6d2ee18279b0b49e773c2196;hb=748281b2dd6f39f24dd90d83c314e2cf719d14aa;hp=328efba9f74e331e47361e83591b01d94dc1616c;hpb=be08f90226feed66d5f7ebac8cfca387d9afdd1f;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 328efba..2f4fdaf 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
@@ -19,10 +19,14 @@ 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--
    echo $installPrefix
+   echo --installPrefixThird--
+   echo $installPrefixThird
    echo --buildType--
    echo $buildType
    echo --gdcmVersion--
@@ -43,8 +47,18 @@ binDir=$generationdir/thirdparty_bin
 if [ ! -e $generationdir ]
 then
    mkdir $generationdir
+   chown $loginUserName:$loginGroupName $generationdir
+fi
+if [ ! -e $sourcesDir ]
+then
    mkdir $sourcesDir
+   chown $loginUserName:$loginGroupName $sourcesDir   
+fi
+
+if [ ! -e $binDir ]
+then
    mkdir $binDir
+   chown $loginUserName:$loginGroupName $binDir     
 fi
 
 
@@ -122,14 +136,18 @@ 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/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
 
@@ -142,33 +160,39 @@ 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=$installPrefix/lib/vtk-5.6/
+  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+  mkdir $dirInstall
   cd $dirInstall
  
   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=$installPrefix CMakeCache.txt
+  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
   dirInstall=$binDir/$libname-Bin
-  export GDCM_DIR=$installPrefix/lib/gdcm/
+  export GDCM_DIR=$installPrefixThird/lib/gdcm/
   mkdir $dirInstall
   cd $dirInstall
   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=$installPrefix CMakeCache.txt
+  cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt
   cmake -D VTK_DIR:PATH=$dirInstallVTK CMakeCache.txt
   cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
   make -j 2
@@ -176,57 +200,80 @@ 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
   dirInstall=$binDir/$libname-Bin
-  export ITK_DIR=$installPrefix/lib/InsightToolkit/
+  export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
   mkdir $dirInstall
   cd $dirInstall
   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=$installPrefix CMakeCache.txt
+  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
-  cp tth $installPrefix/bin
+  cp tth $installPrefixThird/bin
 fi
 
 
 #deal with create creatools_third_party_libraries_config.sh
 
-if [ -f $installPrefix/share/creatools_third_party_library_config.sh ]
+if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
 then
-   rm $installPrefix/share/creatools_third_party_library_config.sh
+   rm $installPrefixThird/share/creatools_third_party_library_config.sh
 fi
 
-if [ ! -e $installPrefix/share ]
+if [ ! -e $installPrefixThird/share ]
 then
-   mkdir $installPrefix/share
+   mkdir $installPrefixThird/share
 fi
-touch     $installPrefix/share/creatools_third_party_library_config.sh
-chmod 755 $installPrefix/share/creatools_third_party_library_config.sh
-
-echo export PATH='$'PATH:$installPrefix/bin            		>> $installPrefix/share/creatools_third_party_library_config.sh
-echo export VTK_DIR=$installPrefix/lib/vtk-5.6         		>> $installPrefix/share/creatools_third_party_library_config.sh
-echo export ITK_DIR=$installPrefix/lib/InsightToolkit  		>> $installPrefix/share/creatools_third_party_library_config.sh
-echo export GDCM_DIR=$installPrefix/lib/gdcm            	>> $installPrefix/share/creatools_third_party_library_config.sh
-echo export TTH=$installPrefix/bin/tth     		    	>> $installPrefix/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR  	>> $installPrefix/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR  	>> $installPrefix/share/creatools_third_party_library_config.sh
-echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR   	>> $installPrefix/share/creatools_third_party_library_config.sh
+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
 
 #  modify .bashrc
-# - remove line 'sh $installPrefix/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
-sed -i -e '/.*creatools_third_party_library_config.*/ d' /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
+
+
+# - 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
 
-# - add line 'sh $installPrefix/share/creatools_third_party_library_config.sh' (with accurate value for ???)
-echo source $installPrefix/share/creatools_third_party_library_config.sh >> /etc/bashrc