X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-load.sh;h=60b38f5b46007cb1c3abafeb7f3c5a4959ee7741;hb=137402ff7060f3db828f9520ebed71796a0d4bfc;hp=eac95568c4cbda35a1062ef2748069282536ace6;hpb=e613970d3ef1c176ed4fac03656298edc9f4bdb6;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index eac9556..60b38f5 100644
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.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
 
 # Set all local variables
@@ -19,6 +43,8 @@
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
+   echo "--ETC_BASHRC--"
+   echo $ETC_BASHRC
    echo --sourcesFrom--
    echo $sourcesFrom
    echo --scriptDir--
@@ -78,19 +104,20 @@ then
    #if [ true = false ]
    then
 #
-      if [ $sourcesFrom = CVS ]
+      if [ $sourcesFrom = GIT ]
       then
-         bash $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
-         bash $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName
-         bash $scriptDir/cvscheckout.sh $creaminitoolssource          $generationdir $cvsUserName
+         bash $scriptDir/gitclone.sh $creasource                   $generationdir
+         bash $scriptDir/gitclone.sh $bbtksource                   $generationdir 
+         bash $scriptDir/gitclone.sh $creamaracassource            $generationdir 
+         bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir 
+         bash $scriptDir/gitclone.sh $creabrukersource             $generationdir 
+         bash $scriptDir/gitclone.sh $creaimagesource              $generationdir 
+         bash $scriptDir/gitclone.sh $creacontourssource           $generationdir 
+         bash $scriptDir/gitclone.sh $crearigidregistrationssource $generationdir 
+         bash $scriptDir/gitclone.sh $bbtkgeditorsource            $generationdir 
+         bash $scriptDir/gitclone.sh $creatoolssource              $generationdir
+         bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir
+         bash $scriptDir/gitclone.sh $creatoolstoolssource         $generationdir
  #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF            $generationdir $cvsUserName
  #	       mv $libidosource-ESRF $libidosource	 	 
       fi
@@ -100,6 +127,7 @@ then
          cd $generationdir/creatools_source
          wwwtargz=http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/nightly/
 
+
          wget $wwwtargz/crea.tgz
          wget $wwwtargz/bbtk.tgz
          wget $wwwtargz/creaMaracasVisu.tgz
@@ -111,7 +139,21 @@ then
          wget $wwwtargz/bbtkGEditor.tgz
          wget $wwwtargz/creaTools.tgz
          wget $wwwtargz/creaMiniTools.tgz
-	 	 	    	 
+	 
+ if [ $OperatingSystem = "MacOS" ]
+ then	 	 	    	 
+         curl $wwwtargz/crea.tgz
+         curl $wwwtargz/bbtk.tgz
+         curl $wwwtargz/creaMaracasVisu.tgz
+         curl $wwwtargz/creaEnvironment.tgz
+         curl $wwwtargz/creaBruker.tgz
+         curl $wwwtargz/creaImageIO.tgz
+         curl $wwwtargz/creaContours.tgz
+         curl $wwwtargz/creaRigidRegistration.tgz
+         curl $wwwtargz/bbtkGEditor.tgz
+         curl $wwwtargz/creaTools.tgz
+         curl $wwwtargz/creaMiniTools.tgz
+ else	 
          tar xvzf crea.tgz
          tar xvzf bbtk.tgz
          tar xvzf creaMaracasVisu.tgz
@@ -123,6 +165,7 @@ then
          tar xvzf bbtkGEditor.tgz
          tar xvzf creaTools.tgz
          tar xvzf creaMiniTools.tgz
+fi
 
          rm -f *.tgz
       fi