X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install-ITK.sh;h=89b2ac98368aa3f5183a735f3960d831f1e58a20;hb=fd2aac7e56a2ae4ecd5ed98deec488f6dbbedc1b;hp=dcc579d8d8d75e9a42aa1c78dfce4bcbfb03d380;hpb=2778417a909f19f22a8ba4d6d8bdc1fa3982b926;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index dcc579d..89b2ac9 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -1,3 +1,27 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
 #!/bin/bash
 
  echo  "in ThirdParty-install-ITK.sh, source " $PWD/scripts/CreaTools-configure.sh
@@ -48,28 +72,29 @@ source $PWD/scripts/CreaTools-configure.sh
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
+#EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 
 fi
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
   echo "we remove old stuff"
@@ -86,48 +111,43 @@ fi
  echo "we download new stuff"
   if [ $ITKVersion = ITK3 ]
   then
-  #  deal with ITK3
-     if [ $OperatingSystem = "MacOS" ]
-     then
-        curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
-     else
-        wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
-     fi
-     tar -xzvf InsightToolkit-3.20.0.tar.gz
+     # deal with ITK3
+     #EED itkfile=InsightToolkit-3.20.0.patchCreatis.tar.gz
+     #EED libname=InsightToolkit-3.20.0
+     itkfile=InsightToolkit-3.20.1.tar.gz
+     libname=InsightToolkit-3.20.1
   else
-    #  deal with ITK4
-    if [ $OperatingSystem = "MacOS" ]
+    # deal with ITK4
+    itkfile=ITK4.0.tgz
+    libname=ITK
+  fi
+
+  if [ $OperatingSystem = "MacOS" ]
     then
-       curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/ITK4.0.tgz
-    else
-       wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/ITK4.0.tgz
-    fi
-    tar -xzvf ITK4.0.tgz
+      curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
+  else
+      wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/$itkfile
   fi
+  tar -xzvf $itkfile
+
 
 #fi # JPR ------------1
 
-if [ $buildType = "Debug" ]
-then
-   debug="ON"
-else
-   debug="OFF"
-fi
+#if [ $buildType = "Debug" ]
+#then
+#   debug="ON"
+#else
+#   debug="OFF"
+#fi
 
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
 then
-  if [ $ITKVersion = ITK3 ]
-  then
-     libname=InsightToolkit-3.20.0
-  else
-     libname=ITK
-  fi
 
   dirInstall=$binDir/$libname-Bin
   export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
-  mkdir $dirInstall
+  mkdir -p $dirInstall
   cd $dirInstall
 
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/