Pass userNameForCVS VTKdir as pameters.

ex :
sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4

diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh
index 6a9a17901f53498095abefdf56f869d9bc82965a..b30901d0622541ce6ec930c75394995929005e98 100644 (file)
--- a/ctest/dashboard/All.sh
+++ b/ctest/dashboard/All.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+echo "Use it as :"
+echo "sh All.sh nameOfTheGenerationDirectory BooleanForDocGeneration userNameForCVS VTKdir"
+echo " "
+echo ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4"
+
 # @echo off
 
 #allow user to choose the generation dir
@@ -8,7 +13,8 @@
 generationdir=$1
 mkdir $generationdir
 mkdir $generationdir/tmpCreaTools_INSTALL
-
+cvsUserName=$3
+VTKdir=$4
 
 # buildtype, useless for Linux; let here for compatibility purpose
  buildtype=Release
@@ -37,24 +43,24 @@ rm -rf $generationdir/creaContoursBin
 rm -rf $generationdir/creaRigidRegistrationBin 
 rm -rf $generationdir/bbtkGEditorBin 
 rm -rf $generationdir/creaToolsBin
- 
-sh cvscheckout.sh $creasource $generationdir
-sh cvscheckout.sh $bbtksource $generationdir
-sh cvscheckout.sh $creamaracassource $generationdir
-sh cvscheckout.sh $creaenvironmentsource $generationdir
-sh cvscheckout.sh $creabrukersource $generationdir
-sh cvscheckout.sh $creaimagesource $generationdir
-sh cvscheckout.sh $creacontourssource $generationdir
-sh cvscheckout.sh $crearigidregistrationssource $generationdir
-sh cvscheckout.sh $bbtkgeditorsource $generationdir
-sh cvscheckout.sh $creatoolssource $generationdir
+
+sh cvscheckout.sh $creasource                   $generationdir $cvsUserName
+sh cvscheckout.sh $bbtksource                   $generationdir $cvsUserName
+sh cvscheckout.sh $creamaracassource            $generationdir $cvsUserName
+sh cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName
+sh cvscheckout.sh $creabrukersource             $generationdir $cvsUserName
+sh cvscheckout.sh $creaimagesource              $generationdir $cvsUserName
+sh cvscheckout.sh $creacontourssource           $generationdir $cvsUserName
+sh cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName
+sh cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName
+sh cvscheckout.sh $creatoolssource              $generationdir $cvsUserName
 
 fi
 
 # CREA
 #if [ true = false ]
 #then
- sh cmakemod.sh                    $creasource $generationdir 
+ sh cmakemod.sh                    $creasource $generationdir  $VTKdir
  sh creaVariables.sh               $creasource $generationdir $docgeneration
  sh compilemod.sh     $buildtype   $creasource $generationdir 
  sh ctestmod.sh                    $creasource $generationdir
@@ -70,7 +76,7 @@ fi
 #if [ true = false ]
 #then
 # BBTK
- sh cmakemod.sh              $bbtksource $generationdir 
+ sh cmakemod.sh              $bbtksource $generationdir $VTKdir
 # echo "============================BBTK out of cmakemod "
  
  sh bbtkVariables.sh         $bbtksource $generationdir $docgeneration
@@ -90,7 +96,7 @@ fi
 #then
  creaMaracasVisu
 # echo "========================================================================================start creaMaracasVisu " 
- sh cmakemod.sh                        $creamaracassource $generationdir
+ sh cmakemod.sh                        $creamaracassource $generationdir $VTKdir
 # echo "=======================================================================================creaMaracasVisu out of cmakemod "
  
  sh creaMaracasVariables.sh            $creamaracassource $generationdir $docgeneration
@@ -105,7 +111,7 @@ fi
 #if [ true = false ]
 #then
 # creaEnvironment
- sh cmakemod.sh                 $creaenvironmentsource $generationdir
+ sh cmakemod.sh                 $creaenvironmentsource $generationdir  $VTKdir
 
  sh creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
  sh compilemod.sh $buildtype    $creaenvironmentsource $generationdir
@@ -117,7 +123,7 @@ fi
 #if [ true = false ]
 #then
 # creaBruker
- sh cmakemod.sh                 $creabrukersource $generationdir
+ sh cmakemod.sh                 $creabrukersource $generationdir  $VTKdir
  sh creaBrukerVariables.sh $creabrukersource $generationdir $docgeneration
 #fi
 
@@ -129,7 +135,7 @@ fi
  LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH
 
 # creaImageIO
- sh cmakemod.sh              $creaimagesource $generationdir
+ sh cmakemod.sh              $creaimagesource $generationdir  $VTKdir
  sh creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creaimagesource $generationdir
  sh ctestmod.sh              $creaimagesource $generationdir
@@ -137,7 +143,7 @@ fi
  LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH
 
 # creaContours
- sh cmakemod.sh              $creacontourssource $generationdir
+ sh cmakemod.sh              $creacontourssource $generationdir  $VTKdir
  sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creacontourssource $generationdir
  sh ctestmod.sh              $creacontourssource $generationdir
@@ -145,7 +151,7 @@ fi
 # LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH
 
 # creaRigidRegistration
- sh cmakemod.sh                       $crearigidregistrationssource $generationdir
+ sh cmakemod.sh                       $crearigidregistrationssource $generationdir  $VTKdir
  sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration
  sh compilemod.sh $buildtype          $crearigidregistrationssource $generationdir
  sh ctestmod.sh                       $crearigidregistrationssource $generationdir
@@ -153,7 +159,7 @@ fi
 # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH
 
 # bbtkGEditor
- sh cmakemod.sh              $bbtkgeditorsource $generationdir
+ sh cmakemod.sh              $bbtkgeditorsource $generationdir  $VTKdir
  sh bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
  sh compilemod.sh $buildtype $bbtkgeditorsource $generationdir
  sh ctestmod.sh              $bbtkgeditorsource $generationdir
@@ -161,8 +167,8 @@ fi
 # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH
 
 # creaTools
- sh cmakemod.sh                     $creatoolssource $generationdir
- sh creaToolsVariables.sh           $creatoolssource $generationdir $docgeneration
+ sh cmakemod.sh                    $creatoolssource $generationdir  $VTKdir
+ sh creaToolsVariables.sh          $creatoolssource $generationdir $docgeneration
  sh compilemod.sh $buildtype       $creatoolssource $generationdir
 # sh ctestmod.sh $creatoolsbinary $generationdir
 #  creatoolsdll=$generationdir/tmpCreaTools_INSTALL/creatoolsBin

diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh
index c23dfdc7d0019badb61e43192397fab503d44c72..751883e48da7bc1ed36073d08ea0da68e2d06904 100644 (file)
--- a/ctest/dashboard/cmakemod.sh
+++ b/ctest/dashboard/cmakemod.sh
@@ -1,5 +1,5 @@
 currentdir=$2
-
+VTKdir=$3
 dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
 
 echo dirInstall
@@ -19,5 +19,5 @@ cmake -D --BUILD_ALL:BOOL=ON CMakeCache.txt
 # This one : only for misinstalled vtk:
 # modify VTK_DIR:PATH=, acording to your own computer
 
-cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$currentdir/tmpCreaTools_INSTALL/$1 -D BBTK_USE_QT:BOOL=OFF -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=/usr/local/lib/vtk-5.4 -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin CMakeCache.txt
+cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$currentdir/tmpCreaTools_INSTALL/$1 -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin CMakeCache.txt
 cd ..

diff --git a/ctest/dashboard/cvscheckout.sh b/ctest/dashboard/cvscheckout.sh
index e3e6580b6e88832b750c9aaec24856993a92a99d..d403d4c6a274e6ad596c6045b296d4a0fee44b0f 100644 (file)
--- a/ctest/dashboard/cvscheckout.sh
+++ b/ctest/dashboard/cvscheckout.sh
@@ -1,5 +1,5 @@
 #cvs -d :ssh:davila@cvs.creatis.insa-lyon.fr:/cvs/creatis checkout $1
 
 cd $2
-cvs -d :ext:jpr@cvs.creatis.insa-lyon.fr:/cvs/creatis checkout $1
+cvs -d :ext:$3@cvs.creatis.insa-lyon.fr:/cvs/creatis checkout $1
 cd ..