From 6fcf2b9d0e7b8ee0ddc81d4342aaf2eb110de38e Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Wed, 15 Sep 2010 10:24:35 +0000 Subject: [PATCH] Some fixes (still not OK till the end :-( ) --- ctest/dashboard/All.sh | 219 +++++++++--------- ctest/dashboard/bbtkVariables.sh | 14 +- ctest/dashboard/cmakemod.sh | 25 +- ctest/dashboard/compilemod.sh | 16 +- ctest/dashboard/creaMaracasVariables.bat | 2 +- ctest/dashboard/creaMaracasVariables.sh | 20 +- .../creaRigidRegistrationVariables.sh | 2 + ctest/dashboard/creaVariables.sh | 5 +- ctest/dashboard/creaenvironmentVariables.sh | 14 +- ctest/dashboard/ctestmod.sh | 14 +- ctest/dashboard/cvscheckout.sh | 6 +- 11 files changed, 188 insertions(+), 149 deletions(-) diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh index 063634b..f7e6ba3 100644 --- a/ctest/dashboard/All.sh +++ b/ctest/dashboard/All.sh @@ -3,153 +3,164 @@ # @echo off #allow user to choose the generation dir +#allow user to choose to generate the doc or not + generationdir=$1 mkdir $generationdir +mkdir $generationdir/tmpCreaTools_INSTALL + # buildtype, useless for Linux; let here for compatibility purpose buildtype=Release creasource=crea - creasourcefolder=$generationdir/crea - creabinfolder=$generationdir/creaBin - bbtksource=bbtk - bbtksourcefolder=$generationdir/bbtk - bbtkbinfolder=$generationdir/bbtkBin - creamaracassource=creaMaracasVisu - creamaracassourcefolder=$generationdir/creaMaracasVisu - creamaracasbinaryfolder=$generationdir/creaMaracasVisuBin - - creaenvironment=creaEnvironment - creaenvironmentsourcefolder=$generationdir/creaEnvironment - creaenvironmentbinaryfolder=$generationdir/creaEnvironmentBin - + creaenvironmentsource=creaEnvironment creabrukersource=creaBruker - creabrukersourcefolder=$generationdir/creaBruker - creabrukerbinaryfolder=$generationdir/creaBrukerBin - creaimagesource=creaImageIO - creaimagesourcefolder=$generationdir/creaImageIO - creaimagebinaryfolder=$generationdir/creaImageIOBin - creacontourssource=creaContours - creacontourssourcefolder=$generationdir/creaContours - creacontoursbinaryfolder=$generationdir/creaContoursBin - crearigidregistrationssource=creaRigidRegistration - crearigidregistrationssourcefolder=$generationdir/creaRigidRegistration - crearigidregistrationbinaryfolder=$generationdir/creaRigidRegistrationBin - bbtkgeditorsource=bbtkGEditor - bbtkgeditorsourcefolder=$generationdir/bbtkGEditor - bbtkgeditorbinaryfolder=$generationdir/bbtkGEditorBin - creatoolssource=creaTools - creatoolssourcefolder=$generationdir/creaTools - creatoolsbinaryfolder=$generationdir/creaToolsBin - -rm -rf creabinfolder -rm -rf bbtkbinfolder -rm -rf creamaracasbinaryfolder -rm -rf creaenvironmentbinaryfolder -rm -rf creabrukerbinaryfolder -rm -rf creaimagebinaryfolder -rm -rf creacontoursbinaryfolder -rm -rf crearigidregistrationbinaryfolder -rm -rf bbtkgeditorbinaryfolder -rm -rf creatoolsbinaryfolder - - 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 + +rm -rf $generationdir/creaBin +rm -rf $generationdir/bbtkBin +rm -rf $generationdir/creamaracasBin +rm -rf $generationdir/creaEnvironmentBin +rm -rf $generationdir/creaBrukerBin +rm -rf $generationdir/creaImageIOBin +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 # CREA - sh cmakemod.sh $creasource $creabinfolder $generationdir - sh creaVariables.sh $creabinfolder $creasourcefolder - sh compilemod.sh $buildtype $creabinfolder - sh ctestmod.sh $creabinfolder - creadll=`pwd`/creabinfolder +#if [ true = false ] +#then + sh cmakemod.sh $creasource $generationdir + sh creaVariables.sh $creasource $generationdir $docgeneration + sh compilemod.sh $buildtype $creasource $generationdir + sh ctestmod.sh $creasource $generationdir +#fi + + + creadll=$generationdir/tmpCreaTools_INSTALL/creaBin LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH + +# echo "=in All.sh, out of crea ============================================================================ $LD_LIBRARY_PATH" + +#if [ true = false ] +#then # BBTK - sh cmakemod.sh $bbtksource $bbtkbinfolder $generationdir - sh bbtkVariables.sh $bbtkbinfolder $creabinfolder - sh compilemod.sh $buildtype $bbtkbinfolder - sh ctestmod.sh $bbtkbinfolder - bbtkdll=`pwd`/bbtkbinfolder + sh cmakemod.sh $bbtksource $generationdir +# echo "============================BBTK out of cmakemod " + + sh bbtkVariables.sh $bbtksource $generationdir $docgeneration +# echo "============================BBTK out of bbtkVariables " + + sh compilemod.sh $buildtype $bbtksource $generationdir + echo "============================BBTK out of compilemod " + + sh ctestmod.sh $bbtksource $generationdir +#fi + + bbtkdll=$generationdir/tmpCreaTools_INSTALL/bbtkBin LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH -# creaMaracasVisu - sh cmakemod.sh $creamaracassource $creamaracasbinary $generationdir - sh creaMaracasVariables.sh $creamaracasbinary $creabinfolder $bbtkbinfolder - sh compilemod.sh $buildtype $creamaracasbinary - sh ctestmod.sh $creamaracasbinary - creamaracasdll=`pwd`/$creamaracasbinary + +#if [ true = false ] +#then + creaMaracasVisu +# echo "========================================================================================start creaMaracasVisu " + sh cmakemod.sh $creamaracassource $generationdir +# echo "=======================================================================================creaMaracasVisu out of cmakemod " + + sh creaMaracasVariables.sh $creamaracassource $generationdir $docgeneration + sh compilemod.sh $buildtype $creamaracassource $generationdir + sh ctestmod.sh $creamaracassource $generationdir +#fi + creamaracasdll=$generationdir/tmpCreaTools_INSTALL/creamaracasBin LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH + + +#if [ true = false ] +#then # creaEnvironment - sh cmakemod.sh $creaenvironment $creaenvironmentbinary $generationdir - sh creaenvironmentVariables.sh $creaenvironmentbinary $creabinfolder - sh compilemod.sh $buildtype $creaenvironmentbinary - sh ctestmod.sh $creaenvironmentbinary - creaenvironmentdll=`pwd`/$creaenvironmentbinary - LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_PATH + sh cmakemod.sh $creaenvironmentsource $generationdir + sh creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration + sh compilemod.sh $buildtype $creaenvironmentsource $generationdir + sh ctestmod.sh $creaenvironmentsource $generationdir +#fi + creaenvironmentdll=$generationdir/tmpCreaTools_INSTALL/creaenvironmentBin + LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_PATH + +#if [ true = false ] +#then # creaBruker - sh cmakemod.sh $creabruker $creabrukerbinary $generationdir - sh creaenvironmentVariables.sh $creabrukerbinary $creabinfolder - sh compilemod.sh $buildtype $creabrukerbinary - sh ctestmod.sh $creabrukerbinary - creabrukerdll=`pwd`$creabrukerbinary + 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 + sh ctestmod.sh $creabrukersource $creabinfolder + creabrukerdll=$generationdir/tmpCreaTools_INSTALL/creabrukerBin LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH # creaImageIO - sh cmakemod.sh $creaimagesource $creaimagebinary $generationdir - sh creaImageIOVariables.sh $creaimagebinary $creabinfolder $bbtkbinfolder $creabrukerbinary - sh compilemod.sh $buildtype $creaimagebinary - sh ctestmod.sh $creaimagebinary - creaimagedll=`pwd`/$creaimagebinary + sh cmakemod.sh $creaimagesource $generationdir + sh creaImageIOVariables.sh $creaimagesource $generationdir $docgeneration + sh compilemod.sh $buildtype $creaimagesource $generationdir + sh ctestmod.sh $creaimagesource $generationdir + creaimagedll=$generationdir/tmpCreaTools_INSTALL/creaimageBin LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH # creaContours - sh cmakemod.sh $creacontourssource $creacontoursbinary $generationdir - sh creaContoursVariables.sh $creacontoursbinary $creasourcefolder $creaenvironmentsource $creamaracassourcefolder $creaimagesourcefolder $bbtksourcefolder - sh compilemod.sh $buildtype $creacontoursbinary - sh ctestmod.sh $creacontoursbinary -# creacontourdll=`pwd`/$creacontoursbinary + sh cmakemod.sh $creacontourssource $generationdir + sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration + sh compilemod.sh $buildtype $creacontourssource $generationdir + sh ctestmod.sh $creacontourssource $generationdir +# creacontourdll=$generationdir/tmpCreaTools_INSTALL/creacontoursBin # LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH # creaRigidRegistration - cmakemod.sh $crearigidregistrationssource $crearigidregistrationbinary $generationdir - creaRigidRegistrationVariables.sh $crearigidregistrationbinary $creabinfolder $bbtksourcefolder - compilemod.sh $buildtype $crearigidregistrationbinary - ctestmod.sh $crearigidregistrationbinary -# crearigidregistrationdll=`pwd`/$crearigidregistrationbinary + cmakemod.sh $crearigidregistrationsource $generationdir + creaRigidRegistrationVariables.sh $crearigidregistrationsource $generationdir $docgeneration + compilemod.sh $buildtype $crearigidregistrationsource $generationdir + ctestmod.sh $crearigidregistrationsource $generationdir +# crearigidregistrationdll=$generationdir/tmpCreaTools_INSTALL/crearigidregistrationBin # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH # bbtkGEditor - sh cmakemod.sh $bbtkgeditorsource $bbtkgeditorbinary $generationdir - sh bbtkGEditorVariables.sh $bbtkgeditorbinary $creasourcefolder $bbtksourcefolder $creamaracassourcefolder - sh compilemod.sh $buildtype $bbtkgeditorbinary - sh ctestmod.sh $bbtkgeditorbinary -# bbtkgeditordll=`pwd`/$bbtkgeditorbinary + sh cmakemod.sh $bbtkgeditorsource $generationdir + sh bbtkGEditorVariables.sh $bbtkgeditorsource $generationdir $docgeneration + sh compilemod.sh $buildtype $bbtkgeditorsource $generationdir + sh ctestmod.sh $bbtkgeditorsource $generationdir +# bbtkgeditordll=$generationdir/tmpCreaTools_INSTALL/bbtkgeditorBin # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH # creaTools - sh cmakemod.sh $creatoolssource $creatoolsbinary $generationdir - sh creaToolsVariables.sh $creatoolsbinary - sh compilemodCreaTools.sh $buildtype $creatoolsbinary -# sh ctestmod.sh $creatoolsbinary - creatoolsdll=`pwd`/$creatoolsbinary + sh cmakemod.sh $creatoolssource $generationdir + sh creaToolsVariables.sh $creatoolssource $generationdir $docgeneration + sh compilemodCreaTools.sh $buildtype $creatoolssource $generationdir +# sh ctestmod.sh $creatoolsbinary $generationdir + creatoolsdll=$generationdir/tmpCreaTools_INSTALL/creatoolsBin LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH # shutdown /s diff --git a/ctest/dashboard/bbtkVariables.sh b/ctest/dashboard/bbtkVariables.sh index c33867c..fbe4408 100644 --- a/ctest/dashboard/bbtkVariables.sh +++ b/ctest/dashboard/bbtkVariables.sh @@ -1,16 +1,18 @@ #!/bin/sh -binfolder=$1 -cd $binfolder -currentdir=`pwd` +# $1 : bbtk +# $2 : generationdir +# $3 : ON/OFF (generate doc) -#currentdir=%currentdir:\=/% -#cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%currentdir%%2 CMakeCache.txt +binfolder=$2/tmpCreaTools_INSTALL/$1Bin +cd $binfolder -cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=$currentdir/$2 CMakeCache.txt +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 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 77077d4..a785813 100644 --- a/ctest/dashboard/cmakemod.sh +++ b/ctest/dashboard/cmakemod.sh @@ -1,20 +1,25 @@ +currentdir=$2 -currentdir=$3 - -dirInstall=$3/tmpCreaTools_INSTALL/$1 +dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin echo dirInstall echo $dirInstall -# needed later -mkdir $2 +mkdir $dirInstall +cd $dirInstall +echo -H$currentdir/$1 +echo -B$dirInstall/ +cmake -G"Unix Makefiles" -H$currentdir/$1 -B$dirInstall/ + +# 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 -cd $2 +# This one : only for misinstalled vtk +#cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$currentdir/tmpCreaTools_INSTALL/$1 -D VTK_DIR:PATH=/usr/local/lib/vtk-5.4 -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt -cmake -G"Unix Makefiles" -H$currentdir/$1 -B$2 +echo "in cmakemod crea_DIR:PATH $currentdir/tmpCreaTools_INSTALL/creaBin" -cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall 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 CMakeCache.txt -#echo "only for misinstalled vtk" -#cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D VTK_DIR:PATH=/usr/local/lib/vtk-5.4 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 a2e4b1d..30b0893 100644 --- a/ctest/dashboard/compilemod.sh +++ b/ctest/dashboard/compilemod.sh @@ -1,10 +1,14 @@ -cd $2 +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 -# A FINIR! -# call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" -# FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%1 -# FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 INSTALL.vcproj -# FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj +make + cd .. diff --git a/ctest/dashboard/creaMaracasVariables.bat b/ctest/dashboard/creaMaracasVariables.bat index cc27378..cd8a39f 100644 --- a/ctest/dashboard/creaMaracasVariables.bat +++ b/ctest/dashboard/creaMaracasVariables.bat @@ -8,4 +8,4 @@ cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_BBTK_PACK cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt cmake CMakeCache.txt -cd .. \ No newline at end of file +cd .. diff --git a/ctest/dashboard/creaMaracasVariables.sh b/ctest/dashboard/creaMaracasVariables.sh index 20718d6..2e7a726 100644 --- a/ctest/dashboard/creaMaracasVariables.sh +++ b/ctest/dashboard/creaMaracasVariables.sh @@ -1,10 +1,18 @@ -# %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk -currentdir=`pwd` -#set currentdir=%currentdir:\=/% +#!/bin/sh -cd $1 -cmake -D crea_DIR:PATH=$currentdir/$2 -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=OFF CMakeCache.txt -cmake -D BBTK_DIR:PATH=$currentdir$3 CMakeCache.txt +# $1 : bbtk +# $2 : generationdir +# $3 : ON/OFF (generate doc) + +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 CMakeCache.txt cmake CMakeCache.txt cd .. diff --git a/ctest/dashboard/creaRigidRegistrationVariables.sh b/ctest/dashboard/creaRigidRegistrationVariables.sh index 0789c47..36f7805 100644 --- a/ctest/dashboard/creaRigidRegistrationVariables.sh +++ b/ctest/dashboard/creaRigidRegistrationVariables.sh @@ -5,4 +5,6 @@ currentdir=`pwd` 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/creaVariables.sh b/ctest/dashboard/creaVariables.sh index 4514229..227df48 100644 --- a/ctest/dashboard/creaVariables.sh +++ b/ctest/dashboard/creaVariables.sh @@ -1,4 +1,7 @@ -binfolder=$1 +binfolder=$2/tmpCreaTools_INSTALL/$1Bin +echo "==================================== in creaVariable.sh : binfolder = $binfolder" + cd $binfolder + cmake -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt cd .. diff --git a/ctest/dashboard/creaenvironmentVariables.sh b/ctest/dashboard/creaenvironmentVariables.sh index 85fd54c..063ba72 100644 --- a/ctest/dashboard/creaenvironmentVariables.sh +++ b/ctest/dashboard/creaenvironmentVariables.sh @@ -1,7 +1,11 @@ -#%1=creacontoursbinary %2=creabinfolder% %3=creaenvironmentbinary %4=creamaracasbinary %5=creaimagebinary %6=bbtkBin -currentdir=`pwd` -#set currentdir=%currentdir:\=/% +#!/bin/sh -cd $1 -cmake -D crea_DIR:PATH=$currentdir$2 CMakeCache.txt +# $1 : bbtk +# $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 cd .. diff --git a/ctest/dashboard/ctestmod.sh b/ctest/dashboard/ctestmod.sh index 27fede3..0e4b6ed 100644 --- a/ctest/dashboard/ctestmod.sh +++ b/ctest/dashboard/ctestmod.sh @@ -1,10 +1,6 @@ -set binfolder=$1 -cd $binfolder -# rem EED>> ctest -D ContinuousStart -D ContinuousUpdate -D ContinuousConfigure -D ContinuousBuild -D ContinuousTest -D ContinuousSubmit -# rem EED>> ctest -D ContinuousMemCheck -D ContinuousSubmit -# rem EED>> ctest -D ExperimentalStart -D ExperimentalUpdate -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit -# rem EED>> ctest -D ExperimentalMemCheck -D ExperimentalSubmit -ctest -D ExperimentalConfigure -D ExperimentalBuild -# rem EED>> ctest -D NightlyStart -D NightlyUpdate -D NightlyConfigure -D NightlyBuild -D NightlyTest -D NightlySubmit -# rem EED>> ctest -D NightlyMemCheck -D NightlySubmit +echo "=in ctestmod ===========================================$2/tmpCreaTools_INSTALL/$1Bin" +cd $2/tmpCreaTools_INSTALL/$1Bin + +/usr/bin/ctest -D ExperimentalConfigure -D ExperimentalBuild + cd .. diff --git a/ctest/dashboard/cvscheckout.sh b/ctest/dashboard/cvscheckout.sh index a1e074c..e3e6580 100644 --- a/ctest/dashboard/cvscheckout.sh +++ b/ctest/dashboard/cvscheckout.sh @@ -1 +1,5 @@ -cvs -d :ssh:davila@cvs.creatis.insa-lyon.fr:/cvs/creatis checkout $1 +#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 +cd .. -- 2.45.1