From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Mon, 24 Jan 2011 19:08:27 +0000 (+0000)
Subject: fixes ?
X-Git-Tag: Creatools2-0-3.creaToolsTools2-0-3.17Feb2011~16
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a7db3fae13174cd8404543cd2ca1b60c8b909466;p=creaToolsTools.git

fixes ?
---

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 725901d..2e1d51c 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -81,10 +81,6 @@ do
 #  if [ "$suitable" = "NO" || "$suitable" = "N"  || "$suitable" = "no" || "$suitable" = "n" ]
  if [ "$suitable" = "NO" ]
   then
-  
-  
-
-	
 	
      echo
      echo
@@ -148,13 +144,13 @@ do
         # ------------------
 
         docgeneration="___"
-        while [[ "$docgeneration" != "YES"  && "$docgeneration" != "NO" ]]
+        while [[ "$docgeneration" != "ON"  && "$docgeneration" != "OFF" ]]
         do
-           echo "Boolean For Doc Generation : YES/NO (default is NO)"
+           echo "Boolean For Doc Generation : ON/OFF (default is OFF)"
            read docgeneration
           if [ "$docgeneration" = "" ]
           then
-             docgeneration="NO"
+             docgeneration="OFF"
           fi
           echo "you said : [" $docgeneration "]"
         done
diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 1d6265e..39f7cbb 100644
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -93,6 +93,7 @@ then
 if [ true = true ]
 then
 # BBTK
+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
diff --git a/Linux/scripts/bbtkVariables.sh b/Linux/scripts/bbtkVariables.sh
index 96d9db1..e466772 100644
--- a/Linux/scripts/bbtkVariables.sh
+++ b/Linux/scripts/bbtkVariables.sh
@@ -5,9 +5,9 @@
 # $3 : ON/OFF (generate doc)
 # $4 : GDCM1 / GDCM2
 
+
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
-
 # use GDCM1 as default !
 if [ $4 = GDCM2 ]
 then
@@ -20,7 +20,10 @@ fi
 
 cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
 cmake -D --BUILD_ALL:BOOL=ON CMakeCache.txt
+echo =============================================================================================
+echo cmake -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=$3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=$3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=$3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=$3 CMakeCache.txt
 cmake -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=$3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=$3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=$3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=$3 CMakeCache.txt
+exit 0
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
diff --git a/Linux/scripts/cmakemod.sh b/Linux/scripts/cmakemod.sh
index 88aa35d..5f84cab 100644
--- a/Linux/scripts/cmakemod.sh
+++ b/Linux/scripts/cmakemod.sh
@@ -35,10 +35,16 @@ cd $dirInstall
 echo -H$currentdir/creatools_source/$1
 echo -B$dirInstall/
 
+
+echo cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
 ## cmake -G"Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
 cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/creatools_source/$1 -B$dirInstall/
 
-cmake -D BUILD_ALL:BOOL=ON -D INCLUDE_CTEST:BOOL=ON -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
+pwd
+echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+echo cmake -D BUILD_ALL:BOOL=ON -D INCLUDE_CTEST:BOOL=ON -D USE_DEBUG_LIB:BOOL=$debug -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
+echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+cmake -D BUILD_ALL:BOOL=ON -D INCLUDE_CTEST:BOOL=ON -D USE_DEBUG_LIB:BOOL=$debug -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
 
 # the following line is the right one!
 #cmake -D INCLUDE_CTEST:BOOL=ON CMakeCache.txt
diff --git a/Linux/scripts/creaImageIOVariables.sh b/Linux/scripts/creaImageIOVariables.sh
index a20242f..87e3eac 100644
--- a/Linux/scripts/creaImageIOVariables.sh
+++ b/Linux/scripts/creaImageIOVariables.sh
@@ -23,7 +23,7 @@ cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin              CMakeCache
 cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin              CMakeCache.txt
 cmake -D creaBruker_DIR:PATH=$currentdir/creatools_bin/creaBrukerBin  CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON                       CMakeCache.txt
-cmake -D BUILD_creaImageIO_DOC:BOOL=$3  -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1                        CMakeCache.txt
+cmake -D BUILD_creaImageIO_DOC:BOOL=$3  -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1  CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=$3           CMakeCache.txt
 
 cmake CMakeCache.txt