X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-compile.sh;h=39f7cbb7b13efe252c1516d95d5d83b4223fa0d8;hb=4515e33035d05fc3d2faec342ff9083087dfd822;hp=74727cf92d80623f323c3184c412768444ae3862;hpb=ebef432aefca42911025c79d171e00212d329e27;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 74727cf..39f7cbb 100644
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -1,125 +1,65 @@
 #!/bin/sh
 
-# Set all local variables
-
-
-source $PWD/scripts/CreaTools-configure.sh
-source $PWD/scripts/CreaTools-names.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 "------"
-
-
-
-
-
-
-
-# Remove! JPRx
-# start_point=2
-
-
-
-
-
-
+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
 
-mkdir $generationdir
-mkdir $generationdir/creatools_source
-mkdir $generationdir/creatools_bin
+# Set all local variables
  
-cd $generationdir
-
-
-# --------------------------------
-#         start_point = 0 : remove everything that was created before
-#---------------------------------
-if [ $start_point -le 0 ]
-then
-# the following stupid test is used at debug time; Please don't remove!
-#if [ true = false ]
-if [ true = true ]
-then
-  rm -rf creatools_bin
-  mkdir $generationdir/creatools_bin
-  rm -rf creatools_source
-  mkdir $generationdir/creatools_source
+ source $PWD/scripts/CreaTools-configure.sh
+ source $PWD/scripts/CreaTools-names.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 "------"
+
+ if [ ! -e $generationdir/creatools_source ]
+ then 
+ echo missing  $generationdir/creatools_source
+   echo
+   echo "..ERROR.."
+   echo "==================================================="
+   echo "REMEMBER !"
+   echo ""
+   echo "YOU NEED TO RUN 'Load' (2) FIRST !"
+   echo "==================================================="
+   echo
+   echo
+   exit 0
 fi
-fi
-
-# ----------------------------------
-#         start_point =  1 : Load all sources
-#-----------------------------------
-
-
-if [ $start_point -le 1 ]
-then
-   if [ true = true ]
-   #if [ true = false ]
-   then
-#
-      if [ $sourcesFrom = CVS ]
-      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
-      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/creaMaracasVisu.tgz
-         wget $wwwtargz/creaEnvironment.tgz
-         wget $wwwtargz/creaBruker.tgz
-         wget $wwwtargz/creaImageIO.tgz
-         wget $wwwtargz/creaContours.tgz
-         wget $wwwtargz/creaRigidRegistration.tgz
-         wget $wwwtargz/bbtkGEditor.tgz
-         wget $wwwtargz/creaTools.tgz
-	 	    	 
-         tar xvzf crea.tgz
-         tar xvzf bbtk.tgz
-         tar xvzf creaMaracasVisu.tgz
-         tar xvzf creaEnvironment.tgz	 	 
-         tar xvzf creaBruker.tgz
-         tar xvzf creaImageIO.tgz
-         tar xvzf creaContours.tgz
-         tar xvzf creaRigidRegistration.tgz
-         tar xvzf bbtkGEditor.tgz
-         tar xvzf creaTools.tgz
-
-         rm -f *.tgz
-      fi
-   fi
-fi
+ cd $generationdir
+ if [ -e creatools_bin ]
+ then
+    rm -rf creatools_bin
+ fi
+ mkdir creatools_bin
 
 cd $scriptDir
 
@@ -153,10 +93,11 @@ then
 if [ true = true ]
 then
 # BBTK
- sh $scriptDir/cmakemod.sh       $bbtksource $generationdir $installPrefix $buildType
- sh $scriptDir/bbtkVariables.sh  $bbtksource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh     $buildType  $bbtksource $generationdir
- sh $scriptDir/ctestmod.sh       $bbtksource $generationdir
+echo ========================================================= $bbtksource $generationdir $installPrefix $buildType
+ sh $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
+ sh $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
+ sh $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir
+ sh $scriptDir/ctestmod.sh               $bbtksource $generationdir
 fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
@@ -173,10 +114,10 @@ then
 if [ true = true ]
 then
 # creaMaracasVisu
- sh $scriptDir/cmakemod.sh                $creamaracassource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaMaracasVariables.sh    $creamaracassource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh              $buildType $creamaracassource $generationdir
- sh $scriptDir/ctestmod.sh                $creamaracassource $generationdir
+ sh $scriptDir/cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
+ sh $scriptDir/creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
+ sh $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir
+ sh $scriptDir/ctestmod.sh              $creamaracassource $generationdir
 fi
 fi
  creamaracasdll=$generationdir/creatools_bin/creamaracasBin