X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-load.sh;h=d85a4b4589871f2c61f1c32a61dd7d521842a450;hb=af5c3e4b663ae6b439603680bcccd42182fc2adf;hp=c323a836a760221b0ce6b703fdd1fec734c5ce43;hpb=3c024174bf9f93ec9339f59b98982975f0c6ef08;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index c323a83..d85a4b4 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--
@@ -43,9 +69,10 @@ fi
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   mkdir $generationdir/creatools_source
-   mkdir $generationdir/creatools_bin
+   mkdir -p $generationdir
+   mkdir -p $generationdir/creatools_source
+   mkdir -p $generationdir/creatools_bin
+   mkdir -p $generationdir/creatools_install   
 fi
 
 cd $generationdir
@@ -59,10 +86,10 @@ then
 #if [ true = false ]
 if [ true = true ]
 then
-#  rm -rf creatools_bin
-#  mkdir $generationdir/creatools_bin
   rm -rf creatools_source
-  mkdir $generationdir/creatools_source
+  rm -rf creatools_bin
+  rm -rf creatools_install
+  mkdir -p $generationdir/creatools_source
 fi
 fi
 
@@ -77,27 +104,33 @@ then
    #if [ true = false ]
    then
 #
-      if [ $sourcesFrom = CVS ]
+      if [ $sourcesFrom = GIT ] || [ $sourcesFrom = GIT-READ-ONLY ];
       then
-         sh $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
-         sh $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName 
-         sh $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName 
+			ssh-add
+         bash $scriptDir/gitclone.sh $creasource                   $generationdir	$sourcesFrom
+         bash $scriptDir/gitclone.sh $bbtksource                   $generationdir	$sourcesFrom
+         bash $scriptDir/gitclone.sh $creavtksource       	       $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $creamaracassource            $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $creabrukersource             $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $creaimagesource              $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $creacontourssource           $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $crearigidregistrationssource $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $bbtkgeditorsource            $generationdir	$sourcesFrom 
+         bash $scriptDir/gitclone.sh $creatoolssource              $generationdir	$sourcesFrom
+         bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir	$sourcesFrom
+         bash $scriptDir/gitclone.sh $creatoolstoolssource         $generationdir	$sourcesFrom
+ #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF         $generationdir   $cvsUserName
+ #	       mv $libidosource-ESRF $libidosource	 	 
       fi
 
       if [ $sourcesFrom = HTML ]
       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/creaVtk.tgz
          wget $wwwtargz/creaMaracasVisu.tgz
          wget $wwwtargz/creaEnvironment.tgz
          wget $wwwtargz/creaBruker.tgz
@@ -106,9 +139,26 @@ then
          wget $wwwtargz/creaRigidRegistration.tgz
          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/creaVtk.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 creaVtk.tgz
          tar xvzf creaMaracasVisu.tgz
          tar xvzf creaEnvironment.tgz	 	 
          tar xvzf creaBruker.tgz
@@ -117,7 +167,8 @@ then
          tar xvzf creaRigidRegistration.tgz
          tar xvzf bbtkGEditor.tgz
          tar xvzf creaTools.tgz
-
+         tar xvzf creaMiniTools.tgz
+fi
          rm -f *.tgz
       fi
    fi