From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Tue, 5 Oct 2010 13:29:07 +0000 (+0000)
Subject: some upgrades
X-Git-Tag: CREATOOLS.2-0-3~31
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5f3676d2d219c77843f8a7a2c3bb1c9cbfbcde26;p=creaToolsTools.git

some upgrades
---

diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh
index 66aa88d..e6e87c7 100644
--- a/ctest/dashboard/All.sh
+++ b/ctest/dashboard/All.sh
@@ -1,20 +1,23 @@
 #!/bin/sh
 
-#if [$# = 0]
-#then
+if [ $# = 0 ]
+then
 echo "Use it as :"
 echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <VTKdir> <installPrefix>"
 echo " "
 echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
-#exit 0
-#fi
+exit 0
+fi
+
 
-#if [$# != 5]
-#then 
-#echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
-#exit 0
-#fi
 
+if [ $# != 5 ]
+then 
+echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
+exit 0
+fi
+
+exit 0
 # @echo off
 
 #allow user to choose the generation dir
@@ -43,7 +46,7 @@ mkdir $generationdir/tmpCreaTools_INSTALL
  bbtkgeditorsource=bbtkGEditor
  creatoolssource=creaTools
 
-if [ true = true ]
+if [ true = false ]
 then
 
 rm -rf $generationdir/creaBin
@@ -79,6 +82,7 @@ fi
  sh ctestmod.sh                    $creasource $generationdir
 #fi
 
+
     
  creadll=$generationdir/tmpCreaTools_INSTALL/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
@@ -104,7 +108,7 @@ fi
  bbtkdll=$generationdir/tmpCreaTools_INSTALL/bbtkBin
  LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
 
-
+ 
 #if [ true = false ]
 #then
  creaMaracasVisu
@@ -120,7 +124,6 @@ fi
  LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH
 
 
-
 #if [ true = false ]
 #then
 # creaEnvironment
diff --git a/ctest/dashboard/bbtkGEditorVariables.sh b/ctest/dashboard/bbtkGEditorVariables.sh
index 9dd5361..ee26523 100644
--- a/ctest/dashboard/bbtkGEditorVariables.sh
+++ b/ctest/dashboard/bbtkGEditorVariables.sh
@@ -9,7 +9,7 @@ cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin                       CMa
 cmake -D BBTK_DIR:PATH=$2/tmpCreaTools_INSTALL/bbtkBin                       CMakeCache.txt
 cmake -D creaMaracasVisu_DIR:PATH=$2/tmpCreaTools_INSTALL/creaMaracasVisuBin CMakeCache.txt
 cmake -D BUILD_bbtkGEditor_DOC:BOOL=$3                                       CMakeCache.txt
-
+cmake -D BUILD_DOXYGEN_DOC:BOOL=$3                                           CMakeCache.txt
 cmake CMakeCache.txt
 
 cd ..
diff --git a/ctest/dashboard/bbtkVariables.sh b/ctest/dashboard/bbtkVariables.sh
index b10660e..863eb64 100644
--- a/ctest/dashboard/bbtkVariables.sh
+++ b/ctest/dashboard/bbtkVariables.sh
@@ -7,9 +7,10 @@
 binfolder=$2/tmpCreaTools_INSTALL/$1Bin
 cd $binfolder
 
-cmake -D --BUILD_ALL:BOOL=ON                           CMakeCache.txt
+#cmake -D BUILD_ALL:BOOL=ON                             CMakeCache.txt
 cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
-cmake -D BUILD_BBTK_DOC:BOOL=$3                        CMakeCache.txt 
+cmake -D BUILD_BBTK_DOC:BOOL=$3                        CMakeCache.txt
+cmake -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=$3            CMakeCache.txt
 
 cmake CMakeCache.txt
 cmake CMakeCache.txt
diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh
index 5c72b64..2f80981 100644
--- a/ctest/dashboard/cmakemod.sh
+++ b/ctest/dashboard/cmakemod.sh
@@ -16,7 +16,7 @@ echo -H$currentdir/$1
 echo -B$dirInstall/
 
 cmake -G"Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
-cmake -D --BUILD_ALL:BOOL=ON CMakeCache.txt
+cmake -D BUILD_ALL:BOOL=ON CMakeCache.txt
 
 # the following line is the right one!
 #cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
diff --git a/ctest/dashboard/creaBrukerVariables.sh b/ctest/dashboard/creaBrukerVariables.sh
index 6063f28..5355243 100644
--- a/ctest/dashboard/creaBrukerVariables.sh
+++ b/ctest/dashboard/creaBrukerVariables.sh
@@ -5,7 +5,7 @@
 binfolder=$2/tmpCreaTools_INSTALL/$1Bin
 cd $binfolder
 
-cmake -D --BUILD_ALL:BOOL=OFF                          CMakeCache.txt
+#cmake -D BUILD_ALL:BOOL=OFF                            CMakeCache.txt
 cmake -D BUILD_creaBruker_DOC:BOOL=$3                  CMakeCache.txt
 cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
 cmake -D BUILD_DOXYGEN_DOC:BOOL=$3                     CMakeCache.txt