X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install.sh;h=836c0af6f8c8af7e2ddeb5c7a16fa3acaffc0010;hb=05abe3279dd77f37c98a79f508cd2ba9b66ff395;hp=54121053283e73a0428620591623df37ceb13de2;hpb=ebef432aefca42911025c79d171e00212d329e27;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 5412105..836c0af 100644
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -1,39 +1,58 @@
 #!/bin/sh
+ if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
+ then 
+   echo
+   echo "..ERROR.."
+   echo "==================================================="
+   echo "REMEMBER !"
+   echo ""
+   echo "YOU NEED TO RUN 'Configure' (0) First !"
+   echo "==================================================="
+   echo
+   echo
+   exit 0
+fi 
 
 source $PWD/scripts/CreaTools-configure.sh
 
-echo "------"
-echo $PWD/scripts/CreaTools-configure.sh
-echo generationdir
-echo $generationdir
-echo docgeneration
-echo $docgeneration
-echo installPrefix
-echo $installPrefix
-echo buildType
-echo $buildType
-echo gdcmVersion
-echo $gdcmVersion
-echo sourcesFrom
-echo $sourcesFrom
-echo scriptDir
-echo $scriptDir
-echo start_point
-echo $start_point
-echo "------"
+   echo "------"
+   echo $PWD/scripts/CreaTools-configure.sh
+   echo --generationdir--
+   echo $generationdir
+   echo --docgeneration--
+   echo $docgeneration
+   echo --installPrefix--
+   echo $installPrefix
+   echo --installPrefixThird--
+   echo $installPrefixThird
+   echo --buildType--
+   echo $buildType
+   echo --gdcmVersion--
+   echo $gdcmVersion
+#   echo --sourcesFrom--
+#   echo $sourcesFrom
+#   echo --scriptDir--
+#   echo $scriptDir
+#   echo --start_point--
+#   echo $start_point
+   echo "------"
+
 
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
 
-mkdir $generationdir
-mkdir $sourcesDir
-mkdir $binDir
+if [ ! -e $generationdir ]
+then
+   mkdir $generationdir
+   mkdir $sourcesDir
+   mkdir $binDir
+fi
 
-rm $installPrefix/share/creatools_third_party_library_config.sh
 
 # the following stupid test is used at debug time; Please don't remove!
 if [ true = true ]
+#if [ true = false ]
 then
 
   case "$OperatingSystem" in
@@ -97,6 +116,7 @@ fi
 
 
 # the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
 if [ true = true ]
 then
   rm -rf $sourcesDir/VTK*
@@ -116,12 +136,11 @@ then
 fi
 
 
-
 if [ $buildType = "Debug" ]
 then
-debug="ON"
+   debug="ON"
 else
-debug="OFF"
+   debug="OFF"
 fi
 
 
@@ -130,27 +149,29 @@ then
   libname=VTK
   dirInstall=$binDir/$libname-Bin
   dirInstallVTK=$dirInstall
-  VTK_DIR=$installPrefix/lib/vtk-5.6/
+  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
   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 install
   cd ..
 fi
 
+
 if [ true = true ]
 then
   libname=gdcm
   dirInstall=$binDir/$libname-Bin
-  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
@@ -162,12 +183,12 @@ if [ true = true ]
 then
   libname=InsightToolkit-3.20.0
   dirInstall=$binDir/$libname-Bin
-  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
   cmake CMakeCache.txt
   make -j 2
@@ -179,28 +200,41 @@ fi
 if [ true = true ]
 then
   cd $sourcesDir
-  cp tth $installPrefix/bin
+  cp tth $installPrefixThird/bin
 fi
 
+
 #deal with create creatools_third_party_libraries_config.sh
 
-touch     $installPrefix/share/creatools_third_party_library_config.sh
-chmod 755 $installPrefix/share/creatools_third_party_library_config.sh
+if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
+then
+   rm $installPrefixThird/share/creatools_third_party_library_config.sh
+fi
 
-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
+if [ ! -e $installPrefixThird/share ]
+then
+   mkdir $installPrefixThird/share
+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
 
 #  modify .bashrc
-# - remove line 'sh $installPrefix/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
+# - remove line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
+sed -i -e '/.*installPrefixThird*/ d' /etc/bashrc
 sed -i -e '/.*creatools_third_party_library_config.*/ d' /etc/bashrc
 
-# - 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 
+# - add line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
+echo installPrefixThird=$installPrefix >> /etc/bashrc
+echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> /etc/bashrc 
+