*** empty log message ***

diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat
index ec3ddb7edafddb1b483b007e964fcd1dee5deda5..634856f42a6c223932607107e3a4de878879278e 100644 (file)
--- a/ctest/dashboard/All.bat
+++ b/ctest/dashboard/All.bat
@@ -1,121 +1,126 @@
 rem @echo off
 set buildtype=Release
+set docgeneration=ON
 
 set creasourcefolder=crea
-set creabinfolder=creaBin
 set bbtksourcefolder=bbtk
-set bbtkbinfolder=bbtkBin
 set creamaracassourcefolder=creaMaracasVisu
-set creamaracasbinary=creaMaracasVisuBin
 set creaenvironmentsource=creaEnvironment
-set creaenvironmentbinary=creaEnvironmentBin
 set creabrukersource=creaBruker
-set creabrukerbinary=creaBrukerBin
 set creaimagesourcefolder=creaImageIO
-set creaimagebinary=creaImageIOBin
 set creacontourssource=creaContours
-set creacontoursbinary=creaContoursBin
 set crearigidregistrationssource=creaRigidRegistration
-set crearigidregistrationbinary=creaRigidRegistrationBin
 set bbtkgeditorsource=bbtkGEditor
-set bbtkgeditorbinary=bbtkGEditorBin
 set creatoolssource=creaTools
-set creatoolsbinary=creaToolsBin
 
+REM set bbtkbinfolder=bbtkBin
+REM set creamaracasbinary=creaMaracasVisuBin
+REM set creaenvironmentbinary=creaEnvironmentBin
+REM set creabrukerbinary=creaBrukerBin
+REM set creaimagebinary=creaImageIOBin
+REM set creacontoursbinary=creaContoursBin
+REM set crearigidregistrationbinary=creaRigidRegistrationBin
+REM set bbtkgeditorbinary=bbtkGEditorBin
+REM set creatoolsbinary=creaToolsBin
 
-call cvscheckout.bat %creasourcefolder%
-call cvscheckout.bat %bbtksourcefolder%
-call cvscheckout.bat %creamaracassourcefolder%
+
+rem call cvscheckout.bat %creasourcefolder%
+rem call cvscheckout.bat %bbtksourcefolder%
+rem call cvscheckout.bat %creamaracassourcefolder%
 call cvscheckout.bat %creaenvironmentsource%
 call cvscheckout.bat %creabrukersource%
 call cvscheckout.bat %creaimagesourcefolder%
-call cvscheckout.bat %creacontourssource%
-call cvscheckout.bat %crearigidregistrationssource%
-call cvscheckout.bat %bbtkgeditorsource%
-call cvscheckout.bat %creatoolssource%
+rem call cvscheckout.bat %creacontourssource%
+rem call cvscheckout.bat %crearigidregistrationssource%
+rem call cvscheckout.bat %bbtkgeditorsource%
+rem call cvscheckout.bat %creatoolssource%
 
 
 rem CREA
-call cmakemod.bat %creasourcefolder% %creabinfolder%
-call creaVariables.bat %creabinfolder% %creasourcefolder%
-call compilemod.bat %buildtype% %creabinfolder%
-call ctestmod.bat %creabinfolder%
+rem call cmakemod.bat %creasourcefolder% 
+rem call creaVariables.bat %creasourcefolder% 
+rem call compilemod.bat %buildtype% %creasourcefolder%
+rem call ctestmod.bat %creasourcefolder%
 set creadll=%~dp0
-set creadll=%creadll%%creabinfolder%\%buildtype%
+set creadll=%creadll%%creasourcefolder%Bin\%buildtype%
 set PATH=%creadll%;%PATH%
 
+
 rem BBTK
-call cmakemod.bat %bbtksourcefolder% %bbtkbinfolder%
-call bbtkVariables.bat %bbtkbinfolder% %creabinfolder%
-call compilemod.bat %buildtype% %bbtkbinfolder%
-call ctestmod.bat %bbtkbinfolder%
+rem call cmakemod.bat %bbtksourcefolder% 
+rem call bbtkVariables.bat %bbtksourcefolder% %docgeneration%
+rem call compilemod.bat %buildtype% %bbtksourcefolder%
+rem call ctestmod.bat %bbtksourcefolder%
 set bbtkdll=%~dp0
-set bbtkdll=%bbtkdll%%bbtkbinfolder%\%buildtype%
+set bbtkdll=%bbtkdll%%bbtksourcefolder%Bin\%buildtype%
 set PATH=%bbtkdll%;%PATH%
 
 rem creaMaracasVisu
-call cmakemod.bat %creamaracassourcefolder% %creamaracasbinary%
-call creaMaracasVariables.bat %creamaracasbinary% %creabinfolder% %bbtkbinfolder%
-call compilemod.bat %buildtype% %creamaracasbinary%
-call ctestmod.bat %creamaracasbinary%
-set creamaracasdll=%~dp0%creamaracasbinary%\%buildtype%
+call cmakemod.bat %creamaracassourcefolder% 
+call creaMaracasVariables.bat %creamaracassourcefolder% %docgeneration%
+call compilemod.bat %buildtype% %creamaracassourcefolder%
+call ctestmod.bat %creamaracassourcefolder%
+set creamaracasdll=%~dp0%creamaracassourcefolder%\%buildtype%
 set PATH=%creamaracasdll%;%PATH%
 
+
 rem creaEnvironment
-call cmakemod.bat %creaenvironmentsource% %creaenvironmentbinary%
-call creaenvironmentVariables.bat %creaenvironmentbinary% %creabinfolder%
-call compilemod.bat %buildtype% %creaenvironmentbinary%
-call ctestmod.bat %creaenvironmentbinary%
-set creaenvironmentdll=%~dp0%creaenvironmentbinary%\%buildtype%
+call cmakemod.bat %creaenvironmentsource% 
+call creaenvironmentVariables.bat %creaenvironmentsource% 
+call compilemod.bat %buildtype% %creaenvironmentsource%
+call ctestmod.bat %creaenvironmentsource%
+set creaenvironmentdll=%~dp0%creaenvironmentsource%\%buildtype%
 set PATH=%creaenvironmentdll%;%PATH%
 
 
 rem JPR : strange : call creaenvironmentVariables.bat here ?!?
 rem creaBruker
-call cmakemod.bat %creabrukersource% %creabrukerbinary%
-call creaenvironmentVariables.bat %creabrukerbinary% %creabinfolder%
-call compilemod.bat %buildtype% %creabrukerbinary%
-call ctestmod.bat %creabrukerbinary%
-set creabrukerdll=%~dp0%creabrukerbinary%\%buildtype%
+call cmakemod.bat %creabrukersource% 
+call creaBrukerVariables.bat %creabrukersource% %docgeneration%
+call compilemod.bat %buildtype% %creabrukersource%
+call ctestmod.bat %creabrukersource%
+set creabrukerdll=%~dp0%creabrukersource%\%buildtype%
 set PATH=%creabrukerdll%;%PATH%
 
 rem creaImageIO
-call cmakemod.bat %creaimagesourcefolder% %creaimagebinary%
-call creaImageIOVariables.bat %creaimagebinary% %creabinfolder% %bbtkbinfolder% %creabrukerbinary%
-call compilemod.bat %buildtype% %creaimagebinary%
-call ctestmod.bat %creaimagebinary%
-set creaimagedll=%~dp0%creaimagebinary%\%buildtype%
+call cmakemod.bat %creaimagesourcefolder% 
+call creaImageIOVariables.bat %creaimagesourcefolder% %docgeneration% 
+call compilemod.bat %buildtype% %creaimagesourcefolder%
+call ctestmod.bat %creaimagesourcefolder%
+set creaimagedll=%~dp0%creaimagesourcefolder%\%buildtype%
 set PATH=%creaimagedll%;%PATH%
 
+pause
+
 rem creaContours
-call cmakemod.bat %creacontourssource% %creacontoursbinary%
-call creaContoursVariables.bat %creacontoursbinary% %creasourcefolder% %creaenvironmentsource% %creamaracassourcefolder% %creaimagesourcefolder% %bbtksourcefolder%
-call compilemod.bat %buildtype% %creacontoursbinary%
-call ctestmod.bat %creacontoursbinary%
-rem set creacontourdll=%~dp0%creacontoursbinary%\%buildtype%
+rem call cmakemod.bat %creacontourssource% 
+rem call creaContoursVariables.bat %creacontourssource% %docgeneration%
+rem call compilemod.bat %buildtype% %creacontourssource%
+rem call ctestmod.bat %creacontourssource%
+rem set creacontourdll=%~dp0%creacontourssource%\%buildtype%
 rem set PATH=%creacontoursdll%;%PATH%
 
 rem creaRigidRegistration
-call cmakemod.bat %crearigidregistrationssource% %crearigidregistrationbinary%
-call creaRigidRegistrationVariables.bat %crearigidregistrationbinary% %creabinfolder% %bbtksourcefolder%
-call compilemod.bat %buildtype% %crearigidregistrationbinary%
-call ctestmod.bat %crearigidregistrationbinary%
-rem set crearigidregistrationdll=%~dp0%crearigidregistrationbinary%\%buildtype%
+rem call cmakemod.bat %crearigidregistrationssource% 
+rem call creaRigidRegistrationVariables.bat %crearigidregistrationssource% %docgeneration% 
+rem call compilemod.bat %buildtype% %crearigidregistrationssource%
+rem call ctestmod.bat %crearigidregistrationssource%
+rem set crearigidregistrationdll=%~dp0%crearigidregistrationssource%\%buildtype%
 rem set PATH=%crearigidregistrationdll%;%PATH%
 
 rem bbtkGEditor
-call cmakemod.bat %bbtkgeditorsource% %bbtkgeditorbinary%
-call bbtkGEditorVariables.bat %bbtkgeditorbinary% %creasourcefolder% %bbtksourcefolder% %creamaracassourcefolder%
-call compilemod.bat %buildtype% %bbtkgeditorbinary%
-call ctestmod.bat %bbtkgeditorbinary%
-rem set bbtkgeditordll=%~dp0%bbtkgeditorbinary%\%buildtype%
+rem call cmakemod.bat %bbtkgeditorsource% 
+rem call bbtkGEditorVariables.bat %bbtkgeditorsource% %docgeneration% 
+rem call compilemod.bat %buildtype% %bbtkgeditorsource%
+rem call ctestmod.bat %bbtkgeditorsource%
+rem set bbtkgeditordll=%~dp0%bbtkgeditorsource%\%buildtype%
 rem set PATH=%bbtkgeditordll%;%PATH%
 
 rem creaTools
-call cmakemod.bat %creatoolssource% %creatoolsbinary%
-call creaToolsVariables.bat %creatoolsbinary%
-call compilemodCreaTools.bat %buildtype% %creatoolsbinary%
-rem call ctestmod.bat %creatoolsbinary%
+rem call cmakemod.bat %creatoolssource% 
+rem call creaToolsVariables.bat %creatoolsbinary%
+rem call compilemodCreaTools.bat %buildtype% %creatoolsbinary%
+rem remrem call ctestmod.bat %creatoolsbinary%
 set creatoolsdll=%~dp0%creatoolsbinary%\%buildtype%
 set PATH=%creatoolssdll%;%PATH%
 

diff --git a/ctest/dashboard/bbtkVariables.bat b/ctest/dashboard/bbtkVariables.bat
index b2e35158b57d87d1b6ff37484a238a569dbf59ff..38696f57452901f2b6ed62e95e734fe088c50188 100644 (file)
--- a/ctest/dashboard/bbtkVariables.bat
+++ b/ctest/dashboard/bbtkVariables.bat
@@ -1,8 +1,10 @@
-set binfolder=%1
+rem %1=bbtksourcefolder% %2=docgeneration
+
+set binfolder=%1Bin
 cd %binfolder%
 set currentdir=%~dp0
 set currentdir=%currentdir:\=/%
-cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%currentdir%%2 CMakeCache.txt
+cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea  -D BUILD_BBTK_DOC:BOOL=%2 CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt

diff --git a/ctest/dashboard/cmakemod.bat b/ctest/dashboard/cmakemod.bat
index f6310c99f646d4b2f809930ab5c175bfa84795b5..d8e9e4b33cca091fd87f37333178f631a297740a 100644 (file)
--- a/ctest/dashboard/cmakemod.bat
+++ b/ctest/dashboard/cmakemod.bat
@@ -1,10 +1,12 @@
+REM %1=<Module Sources  Ex. crea bbbtk creaMaracasVisu...>
+
 set currentdir=%~dp0
 set currentdir=%currentdir:\=/%
 set dirInstall=%currentdir%/tmpCreaTools_INSTALL/%1%
 
-mkdir %2
-cd %2
-cmake -G"Visual Studio 9 2008" -H%currentdir%%1 -B%currentdir%%2
+mkdir %1Bin
+cd %1Bin
+cmake -G"Visual Studio 9 2008" -H%currentdir%%1 -B%currentdir%%1Bin
 cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%dirInstall% CMakeCache.txt
 cd ..
 

diff --git a/ctest/dashboard/compilemod.bat b/ctest/dashboard/compilemod.bat
index ba107a67aab55d4ecad5de73bda9d0cc542a36ce..aeefcb9b3cf73e4a2b97eb02ffa7a10c1ac7024a 100644 (file)
--- a/ctest/dashboard/compilemod.bat
+++ b/ctest/dashboard/compilemod.bat
@@ -1,4 +1,6 @@
-cd %2
+REM %1=buildtype  %2=<Module Sources Ex crea bbtk creaMaracasVisu ...>
+
+cd %2Bin
 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

diff --git a/ctest/dashboard/creaBrukerVariables.bat b/ctest/dashboard/creaBrukerVariables.bat
index be0409531d621c5020cbd5aca6f45221c4cacd92..d8c1c31cfc54fa60ad5088ac63444544d63936e2 100644 (file)
--- a/ctest/dashboard/creaBrukerVariables.bat
+++ b/ctest/dashboard/creaBrukerVariables.bat
@@ -1,8 +1,8 @@
-rem %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk
+rem %1=creabrukersource% %2=docgeneration
+
+set binfolder=%1Bin
+cd %binfolder%
 set currentdir=%~dp0
 set currentdir=%currentdir:\=/%
-
-cd %1
-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
+cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea  -D BUILD_creaBruker_DOC:BOOL=%2 CMakeCache.txt
 cd ..
\ No newline at end of file

diff --git a/ctest/dashboard/creaImageIOVariables.bat b/ctest/dashboard/creaImageIOVariables.bat
index be0409531d621c5020cbd5aca6f45221c4cacd92..37fd867a47166c53a2002345c78f79da5917531f 100644 (file)
--- a/ctest/dashboard/creaImageIOVariables.bat
+++ b/ctest/dashboard/creaImageIOVariables.bat
@@ -1,8 +1,11 @@
-rem %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk
+rem %1=creabrukersource% %2=docgeneration
+
 set currentdir=%~dp0
 set currentdir=%currentdir:\=/%
 
 cd %1
-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
+cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaImageIO_DOC:BOOL=ON -D creaBruker_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt
+cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt
+cmake -D BUILD_DOXYGEN_DOC:BOOL=ON -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=ON CMakeCache.txt
+
 cd ..
\ No newline at end of file

diff --git a/ctest/dashboard/creaMaracasVariables.bat b/ctest/dashboard/creaMaracasVariables.bat
index 99f2813f16649d48380985abd6714e35f2d372d4..ee59b0a859e94cd58959c17f9e3f971c93f41000 100644 (file)
--- a/ctest/dashboard/creaMaracasVariables.bat
+++ b/ctest/dashboard/creaMaracasVariables.bat
@@ -1,10 +1,11 @@
-rem %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk
+rem %1=creamaracassourcefolder %2=docgeneration
+
 set currentdir=%~dp0
 set currentdir=%currentdir:\=/%
 
-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
-cmake CMakeCache.txt
+cd %1Bin
+cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%2 CMakeCache.txt
+cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt
+cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=ON CMakeCache.txt
 cmake CMakeCache.txt
 cd ..
\ No newline at end of file

diff --git a/ctest/dashboard/creaVariables.bat b/ctest/dashboard/creaVariables.bat
index 7a27685b5c189a569718ecfa9b08f2ed4b67e328..c8e6767c16098042e403dd54485e6e6420d8afdc 100644 (file)
--- a/ctest/dashboard/creaVariables.bat
+++ b/ctest/dashboard/creaVariables.bat
@@ -1,4 +1,6 @@
-set binfolder=%1
+REM %1=creasourcefolder
+
+set binfolder=%1Bin
 cd %binfolder%
 cmake -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt
 cd ..
\ No newline at end of file

diff --git a/ctest/dashboard/creaenvironmentVariables.bat b/ctest/dashboard/creaenvironmentVariables.bat
index d794bc29a58f3b69186c09199e65817999259d21..a09e2867d9bcba35875236e776f98e6c32f0c45c 100644 (file)
--- a/ctest/dashboard/creaenvironmentVariables.bat
+++ b/ctest/dashboard/creaenvironmentVariables.bat
@@ -1,7 +1,8 @@
-rem %1=creacontoursbinary  %2=creabinfolder% %3=creaenvironmentbinary %4=creamaracasbinary %5=creaimagebinary %6=bbtkBin
+rem %1=creaenvironmentsource 
+
 set currentdir=%~dp0
 set currentdir=%currentdir:\=/%
 
-cd %1
-cmake -D crea_DIR:PATH=%currentdir%%2 CMakeCache.txt
+cd %1Bin
+cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea CMakeCache.txt
 cd ..
\ No newline at end of file

diff --git a/ctest/dashboard/ctestmod.bat b/ctest/dashboard/ctestmod.bat
index d11db0a7f547a7da4fd514b0d415cc1650e0dec0..d89236006a79564de7d51a6fc85a2d345ea8b749 100644 (file)
--- a/ctest/dashboard/ctestmod.bat
+++ b/ctest/dashboard/ctestmod.bat
@@ -1,4 +1,6 @@
-set binfolder=%1
+REM %1=<Module Sources  Ex. crea bbbtk creaMaracasVisu...>
+
+set binfolder=%1Bin
 cd %binfolder%
 rem EED>> ctest -D ContinuousStart -D ContinuousUpdate -D ContinuousConfigure -D ContinuousBuild -D ContinuousTest -D ContinuousSubmit
 rem EED>> ctest -D ContinuousMemCheck -D ContinuousSubmit