From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Thu, 16 Sep 2010 11:21:13 +0000 (+0000)
Subject: Last (?) fixes
X-Git-Tag: CREATOOLS.2-0-3~54
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0f44123be5b25c653499265d5c86b9e7be4dfa6e;p=creaToolsTools.git

Last (?) fixes
---

diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh
index 2d0a1e3..9a71414 100644
--- a/ctest/dashboard/All.sh
+++ b/ctest/dashboard/All.sh
@@ -140,10 +140,10 @@ sh cvscheckout.sh $creatoolssource $generationdir
 # LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH
 
 # creaRigidRegistration
- sh cmakemod.sh                       $crearigidregistrationsource $generationdir
- sh creaRigidRegistrationVariables.sh $crearigidregistrationsource $generationdir $docgeneration
- sh compilemod.sh $buildtype          $crearigidregistrationsource $generationdir
- sh ctestmod.sh                       $crearigidregistrationsource $generationdir
+ sh cmakemod.sh                       $crearigidregistrationssource $generationdir
+ sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration
+ sh compilemod.sh $buildtype          $crearigidregistrationssource $generationdir
+ sh ctestmod.sh                       $crearigidregistrationssource $generationdir
 # crearigidregistrationdll=$generationdir/tmpCreaTools_INSTALL/crearigidregistrationBin
 # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH
 
@@ -156,12 +156,12 @@ sh cvscheckout.sh $creatoolssource $generationdir
 # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH
 
 # creaTools
- sh cmakemod.sh                             $creatoolssource $generationdir
- sh creaToolsVariables.sh                   $creatoolssource $generationdir $docgeneration
- sh compilemodCreaTools.sh $buildtype       $creatoolssource $generationdir
+ sh cmakemod.sh                     $creatoolssource $generationdir
+ sh creaToolsVariables.sh           $creatoolssource $generationdir $docgeneration
+ sh compilemod .sh $buildtype       $creatoolssource $generationdir
 # sh ctestmod.sh $creatoolsbinary $generationdir
- creatoolsdll=$generationdir/tmpCreaTools_INSTALL/creatoolsBin
- LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH
+#  creatoolsdll=$generationdir/tmpCreaTools_INSTALL/creatoolsBin
+#  LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH
 
 # shutdown /s
 # exit /b
diff --git a/ctest/dashboard/bbtkGEditorVariables.sh b/ctest/dashboard/bbtkGEditorVariables.sh
index 4c357cd..915a82a 100644
--- a/ctest/dashboard/bbtkGEditorVariables.sh
+++ b/ctest/dashboard/bbtkGEditorVariables.sh
@@ -1,11 +1,14 @@
-# %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk
-currentdir=`pwd`
-# set currentdir=%currentdir:\=/%
+# $1 : creaBruker
+# $2 : generationdir
+# $3 : ON/OFF (generate doc)
+
+binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+cd $binfolder
+
+cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
+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
 
-cd $1
-cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$2 -D BUILD_bbtkGEditor_DOC:BOOL=OFF CMakeCache.txt
-cmake -D BBTK_DIR:PATH=ùcurrentdir/tmpCreaTools_INSTALL/$3 CMakeCache.txt
-cmake -D creaMaracasVisu_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$4 CMakeCache.txt
-cmake CMakeCache.txt
 cmake CMakeCache.txt
 cd ..
diff --git a/ctest/dashboard/creaContoursVariables.sh b/ctest/dashboard/creaContoursVariables.sh
index df32ba6..2124f1f 100644
--- a/ctest/dashboard/creaContoursVariables.sh
+++ b/ctest/dashboard/creaContoursVariables.sh
@@ -6,6 +6,6 @@ binfolder=$2/tmpCreaTools_INSTALL/$1Bin
 cd $binfolder
 
 cmake -D BBTK_DIR:PATH=$2/tmpCreaTools_INSTALL/bbtkBin -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON  -D creaContours_DOC:BOOL=$3 CMakeCache.txt
-#cmake -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt
 
 cd ..
diff --git a/ctest/dashboard/creaRigidRegistrationVariables.sh b/ctest/dashboard/creaRigidRegistrationVariables.sh
index 36f7805..29a137a 100644
--- a/ctest/dashboard/creaRigidRegistrationVariables.sh
+++ b/ctest/dashboard/creaRigidRegistrationVariables.sh
@@ -1,10 +1,13 @@
-# %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk
-currentdir=`pwd`
-# set currentdir=%currentdir:\=/%
+# $1 : creaBruker
+# $2 : generationdir
+# $3 : ON/OFF (generate doc)
+
+binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+cd $binfolder
+
+
+cmake -D crea_DIR:PATH=$currentdir$2 -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON -D BUILD_creaRigidRegistration_DOC:BOOL=$3 -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
 
-cd $1
-cmake -D crea_DIR:PATH=$currentdir$2 -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON -D BUILD_creaRigidRegistration_DOC:BOOL=OFF CMakeCache.txt
-cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$3 CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 cd ..
diff --git a/ctest/dashboard/creaToolsVariables.sh b/ctest/dashboard/creaToolsVariables.sh
index ad3f74a..75730f0 100644
--- a/ctest/dashboard/creaToolsVariables.sh
+++ b/ctest/dashboard/creaToolsVariables.sh
@@ -1,6 +1,9 @@
-currentdir=`pwd`
-#set currentdir=%currentdir:\=/%
+# $1 : creaBruker
+# $2 : generationdir
+# $3 : ON/OFF (generate doc)
+
+binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+cd $binfolder
 
-cd $1
 cmake -D CREATOOLS_SOURCE_PATH:PATH=$currentdir/tmpCreaTools_INSTALL/ CMakeCache.txt
 cd ..