From fea5c9c2874682e3d3585a51c04828e62431feed Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 16 Sep 2010 13:42:24 +0000 Subject: [PATCH] Script cleaning. Everything copiles, now ( build doc = OFF) --- ctest/dashboard/All.sh | 9 +++++---- ctest/dashboard/bbtkGEditorVariables.sh | 7 ++++--- ctest/dashboard/bbtkVariables.sh | 8 +++++--- ctest/dashboard/cmakemod.sh | 2 +- ctest/dashboard/compilemod.sh | 11 ++++------- ctest/dashboard/creaContoursVariables.sh | 7 ++++++- ctest/dashboard/creaImageIOVariables.sh | 13 ++++++++----- ctest/dashboard/creaMaracasVariables.sh | 12 +++++++----- ctest/dashboard/creaToolsVariables.sh | 5 ++++- ctest/dashboard/creaenvironmentVariables.sh | 5 ++++- 10 files changed, 48 insertions(+), 31 deletions(-) diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh index 9a71414..59246eb 100644 --- a/ctest/dashboard/All.sh +++ b/ctest/dashboard/All.sh @@ -109,16 +109,17 @@ sh cvscheckout.sh $creatoolssource $generationdir #fi creaenvironmentdll=$generationdir/tmpCreaTools_INSTALL/creaenvironmentBin LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_PATH - + #if [ true = false ] #then # creaBruker sh cmakemod.sh $creabrukersource $generationdir sh creaBrukerVariables.sh $creabrukersource $generationdir $docgeneration #fi + sh compilemod.sh $buildtype $creabrukersource $generationdir - echo "creaBruker : out of compilemod.sh; stop here, now!" - exit 0 +# echo "creaBruker : out of compilemod.sh; stop here, now!" +# exit 0 sh ctestmod.sh $creabrukersource $creabinfolder creabrukerdll=$generationdir/tmpCreaTools_INSTALL/creabrukerBin LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH @@ -158,7 +159,7 @@ sh cvscheckout.sh $creatoolssource $generationdir # creaTools sh cmakemod.sh $creatoolssource $generationdir sh creaToolsVariables.sh $creatoolssource $generationdir $docgeneration - sh compilemod .sh $buildtype $creatoolssource $generationdir + sh compilemod.sh $buildtype $creatoolssource $generationdir # sh ctestmod.sh $creatoolsbinary $generationdir # creatoolsdll=$generationdir/tmpCreaTools_INSTALL/creatoolsBin # LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH diff --git a/ctest/dashboard/bbtkGEditorVariables.sh b/ctest/dashboard/bbtkGEditorVariables.sh index 915a82a..9dd5361 100644 --- a/ctest/dashboard/bbtkGEditorVariables.sh +++ b/ctest/dashboard/bbtkGEditorVariables.sh @@ -5,10 +5,11 @@ 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 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 +cmake -D BUILD_bbtkGEditor_DOC:BOOL=$3 CMakeCache.txt cmake CMakeCache.txt + cd .. diff --git a/ctest/dashboard/bbtkVariables.sh b/ctest/dashboard/bbtkVariables.sh index fbe4408..b10660e 100644 --- a/ctest/dashboard/bbtkVariables.sh +++ b/ctest/dashboard/bbtkVariables.sh @@ -7,12 +7,14 @@ binfolder=$2/tmpCreaTools_INSTALL/$1Bin cd $binfolder -echo " = in bbtkVariables crea_DIR : $2/tmpCreaTools_INSTALL/crea" -cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin -D BUILD_BBTK_DOC:BOOL=$3 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 CMakeCache.txt cmake CMakeCache.txt cmake CMakeCache.txt cmake CMakeCache.txt cmake CMakeCache.txt -cmake CMakeCache.tx cmake CMakeCache.txt cd .. diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh index a785813..42f5561 100644 --- a/ctest/dashboard/cmakemod.sh +++ b/ctest/dashboard/cmakemod.sh @@ -21,5 +21,5 @@ echo "in cmakemod crea_DIR:PATH $currentdir/tmpCreaTools_INSTALL/creaBin" #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 CMakeCache.txt -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_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 cd .. diff --git a/ctest/dashboard/compilemod.sh b/ctest/dashboard/compilemod.sh index 30b0893..b0b7787 100644 --- a/ctest/dashboard/compilemod.sh +++ b/ctest/dashboard/compilemod.sh @@ -1,13 +1,10 @@ -cd $3/tmpCreaTools_INSTALL/$2Bin # $1 : useless for Linux (Release/Debug) -echo "=in compilemod.sh ====================================================== $3/tmpCreaTools_INSTALL/$2Bin " -echo $1 -echo $2 -echo $3 -echo "=in compilemod.sh ====================================================== $3/tmpCreaTools_INSTALL/$2Bin " -pwd +cd $3/tmpCreaTools_INSTALL/$2Bin +#echo $1 +#echo $2 +#echo $3 make diff --git a/ctest/dashboard/creaContoursVariables.sh b/ctest/dashboard/creaContoursVariables.sh index 2124f1f..0da38b1 100644 --- a/ctest/dashboard/creaContoursVariables.sh +++ b/ctest/dashboard/creaContoursVariables.sh @@ -5,7 +5,12 @@ 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 BBTK_DIR:PATH=$2/tmpCreaTools_INSTALL/bbtkBin CMakeCache.txt +cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt +cmake -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON CMakeCache.txt +cmake -D creaContours_DOC:BOOL=$3 CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt +cmake CMakeCache.txt + cd .. diff --git a/ctest/dashboard/creaImageIOVariables.sh b/ctest/dashboard/creaImageIOVariables.sh index f77a0f6..59257bd 100644 --- a/ctest/dashboard/creaImageIOVariables.sh +++ b/ctest/dashboard/creaImageIOVariables.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $1 : bbtk +# $1 : 'creaImageIO' # $2 : generationdir # $3 : ON/OFF (generate doc) @@ -8,9 +8,12 @@ currentdir=$2 binfolder=$2/tmpCreaTools_INSTALL/$1Bin cd $binfolder -cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaImageIO_DOC:BOOL=$3 CMakeCache.txt -cmake -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt +cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin CMakeCache.txt +cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt +cmake -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON CMakeCache.txt +cmake -D BUILD_creaImageIO_DOC:BOOL=$3 CMakeCache.txt +cmake -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt + +cmake CMakeCache.txt -#cmake -D crea_DIR:PATH=$currentdir$2 -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaImageIO_DOC:BOOL=ON -D creaBruker_DIR:PATH=$currentdir$4 -D USE_GDCM:BOOL=ON CMakeCache.txt -#cmake -D BBTK_DIR:PATH=$currentdir$3 CMakeCache.txt cd .. diff --git a/ctest/dashboard/creaMaracasVariables.sh b/ctest/dashboard/creaMaracasVariables.sh index 2e7a726..de55629 100644 --- a/ctest/dashboard/creaMaracasVariables.sh +++ b/ctest/dashboard/creaMaracasVariables.sh @@ -7,12 +7,14 @@ currentdir=$2 binfolder=$2/tmpCreaTools_INSTALL/$1Bin cd $binfolder -echo " = in creaMaracaxVariables crea_DIR : $2/tmpCreaTools_INSTALL/crea" -#currentdir=$2/tmpCreaTools_INSTALL/$1 -cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=$3 CMakeCache.txt -#cmake -D BBTK_DIR:PATH=$currentdir$3 CMakeCache.txt -cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt +cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin CMakeCache.txt +cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt +cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON CMakeCache.txt +cmake -D creaMaracasVisu_DOC:BOOL=$3 CMakeCache.txt +cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=$3 CMakeCache.txt + cmake CMakeCache.txt cmake CMakeCache.txt + cd .. diff --git a/ctest/dashboard/creaToolsVariables.sh b/ctest/dashboard/creaToolsVariables.sh index 75730f0..f9da12e 100644 --- a/ctest/dashboard/creaToolsVariables.sh +++ b/ctest/dashboard/creaToolsVariables.sh @@ -1,4 +1,4 @@ -# $1 : creaBruker +# $1 : 'creaTools' # $2 : generationdir # $3 : ON/OFF (generate doc) @@ -6,4 +6,7 @@ binfolder=$2/tmpCreaTools_INSTALL/$1Bin cd $binfolder cmake -D CREATOOLS_SOURCE_PATH:PATH=$currentdir/tmpCreaTools_INSTALL/ CMakeCache.txt + +cmake CMakeCache.txt + cd .. diff --git a/ctest/dashboard/creaenvironmentVariables.sh b/ctest/dashboard/creaenvironmentVariables.sh index 063ba72..0eed0f1 100644 --- a/ctest/dashboard/creaenvironmentVariables.sh +++ b/ctest/dashboard/creaenvironmentVariables.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $1 : bbtk +# $1 : 'creaEnvironment' # $2 : generationdir # $3 : ON/OFF (generate doc) @@ -8,4 +8,7 @@ binfolder=$2/tmpCreaTools_INSTALL/$1Bin cd $binfolder cmake -D crea_DIR:PATH=$2/tmpCreaTools_INSTALL/creaBin CMakeCache.txt + +cmake CMakeCache.txt + cd .. -- 2.45.1