X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=ctest%2Fdashboard%2FAll.sh;h=e117f2db61fd0b7889e7239b8e8a681f1a822d59;hb=e95400057316f6be2396a05bfcad35f676b5452d;hp=e6e87c7391ae2d0043f1bcca6d49aef680fcd69a;hpb=5f3676d2d219c77843f8a7a2c3bb1c9cbfbcde26;p=creaToolsTools.git

diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh
index e6e87c7..e117f2d 100644
--- a/ctest/dashboard/All.sh
+++ b/ctest/dashboard/All.sh
@@ -3,21 +3,18 @@
 if [ $# = 0 ]
 then
 echo "Use it as :"
-echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <VTKdir> <installPrefix>"
+echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <VTKdir> <installPrefix> <buildType>"
 echo " "
 echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
 exit 0
 fi
 
-
-
-if [ $# != 5 ]
+if [ $# != 6 ]
 then 
-echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
+echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory Release"
 exit 0
 fi
 
-exit 0
 # @echo off
 
 #allow user to choose the generation dir
@@ -27,13 +24,10 @@ generationdir=$1
 cvsUserName=$3
 VTKdir=$4
 installPrefix=$5
+buildtype=$6
 
 mkdir $generationdir
-mkdir $generationdir/tmpCreaTools_INSTALL
-
-
-# buildtype, useless for Linux; let here for compatibility purpose
- buildtype=Release
+mkdir $generationdir/tmpCreaToolsBIN
 
  creasource=crea
  bbtksource=bbtk
@@ -46,7 +40,8 @@ mkdir $generationdir/tmpCreaTools_INSTALL
  bbtkgeditorsource=bbtkGEditor
  creatoolssource=creaTools
 
-if [ true = false ]
+# the following stupid test is used at debug time; Please don't remove!
+if [ true = true ]
 then
 
 rm -rf $generationdir/creaBin
@@ -76,13 +71,11 @@ fi
 # CREA
 #if [ true = false ]
 #then
- sh cmakemod.sh                    $creasource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                    $creasource $generationdir $VTKdir $installPrefix $buildType
  sh creaVariables.sh               $creasource $generationdir $docgeneration
  sh compilemod.sh     $buildtype   $creasource $generationdir 
  sh ctestmod.sh                    $creasource $generationdir
 #fi
-
-
     
  creadll=$generationdir/tmpCreaTools_INSTALL/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
@@ -93,7 +86,7 @@ fi
 #if [ true = false ]
 #then
 # BBTK
- sh cmakemod.sh              $bbtksource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh              $bbtksource $generationdir $VTKdir $installPrefix $buildType
 # echo "============================BBTK out of cmakemod "
  
  sh bbtkVariables.sh         $bbtksource $generationdir $docgeneration
@@ -108,12 +101,11 @@ fi
  bbtkdll=$generationdir/tmpCreaTools_INSTALL/bbtkBin
  LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
 
- 
 #if [ true = false ]
 #then
  creaMaracasVisu
 # echo "========================================================================================start creaMaracasVisu " 
- sh cmakemod.sh                        $creamaracassource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                        $creamaracassource $generationdir $VTKdir $installPrefix $buildType
 # echo "=======================================================================================creaMaracasVisu out of cmakemod "
  
  sh creaMaracasVariables.sh            $creamaracassource $generationdir $docgeneration
@@ -127,7 +119,7 @@ fi
 #if [ true = false ]
 #then
 # creaEnvironment
- sh cmakemod.sh                 $creaenvironmentsource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                 $creaenvironmentsource $generationdir $VTKdir $installPrefix $buildType
 
  sh creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
  sh compilemod.sh $buildtype    $creaenvironmentsource $generationdir
@@ -139,10 +131,9 @@ fi
 #if [ true = false ]
 #then
 # creaBruker
- sh cmakemod.sh                 $creabrukersource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                 $creabrukersource $generationdir $VTKdir $installPrefix $buildType
  sh creaBrukerVariables.sh $creabrukersource $generationdir $docgeneration
 #fi
-
  sh compilemod.sh $buildtype    $creabrukersource  $generationdir
 # echo "creaBruker : out of compilemod.sh; stop here, now!"
 # exit 0
@@ -151,7 +142,7 @@ fi
  LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH
 
 # creaImageIO
- sh cmakemod.sh              $creaimagesource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh              $creaimagesource $generationdir $VTKdir $installPrefix $buildType
  sh creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creaimagesource $generationdir
  sh ctestmod.sh              $creaimagesource $generationdir
@@ -159,7 +150,7 @@ fi
  LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH
 
 # creaContours
- sh cmakemod.sh              $creacontourssource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh              $creacontourssource $generationdir $VTKdir $installPrefix $buildType
  sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creacontourssource $generationdir
  sh ctestmod.sh              $creacontourssource $generationdir
@@ -167,7 +158,7 @@ fi
 # LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH
 
 # creaRigidRegistration
- sh cmakemod.sh                       $crearigidregistrationssource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                       $crearigidregistrationssource $generationdir $VTKdir $installPrefix $buildType
  sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration
  sh compilemod.sh $buildtype          $crearigidregistrationssource $generationdir
  sh ctestmod.sh                       $crearigidregistrationssource $generationdir
@@ -175,7 +166,7 @@ fi
 # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH
 
 # bbtkGEditor
- sh cmakemod.sh              $bbtkgeditorsource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh              $bbtkgeditorsource $generationdir $VTKdir $installPrefix $buildType
  sh bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
  sh compilemod.sh $buildtype $bbtkgeditorsource $generationdir
  sh ctestmod.sh              $bbtkgeditorsource $generationdir
@@ -183,7 +174,7 @@ fi
 # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH
 
 # creaTools
- sh cmakemod.sh                    $creatoolssource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                    $creatoolssource $generationdir $VTKdir $installPrefix $buildType
  sh creaToolsVariables.sh          $creatoolssource $generationdir $docgeneration
  sh compilemod.sh $buildtype       $creatoolssource $generationdir
 # sh ctestmod.sh $creatoolsbinary $generationdir