*** empty log message ***

[creaToolsTools.git] / Linux / scripts / ThirdParty-install-gdcm.sh

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index beabbe69c9259b960935e99b2848f1f712f79078..ed672c3613904c907fd3cddf5bb537d0e2727ee7 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.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
 
 source $PWD/scripts/CreaTools-configure.sh
 
@@ -45,36 +46,42 @@ binDir=$generationdir/thirdparty_bin
 if [ ! -e $generationdir ]
 then
    mkdir $generationdir
-   chown $loginUserName:$loginGroupName $generationdir
+   chown $loginUserName  $generationdir
+   chgrp $loginGroupName $generationdir
+
 fi
 if [ ! -e $sourcesDir ]
 then
    mkdir $sourcesDir
+   #was : (pb on MacOS?)
+   #chown $loginUserName:$loginGroupName $sourcesDir
+   chown $loginUserName  $sourcesDir
+   chgrp $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
    mkdir $binDir
+   chown $loginUserName  $binDir
+   chgrp $loginGroupName $binDir
 fi
 
-
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-
+  echo "we remove old stuff"
   rm -rf $sourcesDir/gdcm*
-
   rm -rf $binDir/gdcm*
 
   cd $sourcesDir
-  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_08_Dic_2009.tar.gz
-
-
-  tar -xvzf gdcm_08_Dic_2009.tar.gz
-
-fi
 
+  echo "we download new stuff"
+ if [ $OperatingSystem = "MacOS" ]
+ then
+  curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+  # MacOS, clever enough to understand it *has* to uncompress, doesn't understand tar -z :-(
+  tar -xvf gdcm_05_Mai_2011.tar.gz
+ else
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+  tar -xvzf gdcm_05_Mai_2011.tar.gz
+ fi
 
 if [ $buildType = "Debug" ]
 then
@@ -83,7 +90,6 @@ else
    debug="OFF"
 fi
 
-
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
@@ -93,12 +99,13 @@ then
   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=$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
+  make -j $corenumber
   make install
   cd ..
 fi
@@ -111,35 +118,6 @@ then
 fi
 
 
-#deal with create creatools_third_party_libraries_config.sh
-
-if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ]
-then
-   rm $installPrefixThird/share/creatools_third_party_library_config.sh
-fi
-
-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
-
-export ETC_BASHRC=$HOME/.bashrc
-
-   sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
-   sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC
-
+# deal with create creatools_third_party_libraries_config.sh
+# is now done in ThirdParty-install-Finalize.sh
 
-# - 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