From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Mon, 30 Aug 2010 23:55:14 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~73
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b2fecb5eea23bf906d7693cc5dfb23e626f4f5f2;p=creaToolsTools.git

*** empty log message ***
---

diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat
index 8f4aff1..1116e26 100644
--- a/ctest/dashboard/All.bat
+++ b/ctest/dashboard/All.bat
@@ -75,10 +75,32 @@ set creacontoursbinary=creaContoursBin
 rem call cvscheckout.bat %creacontourssource%
 rem call cmakemod.bat %creacontourssource% %creacontoursbinary%
 rem call creaContoursVariables.bat %creacontoursbinary% %creabinfolder% %creaenvironmentbinary% %creamaracasbinary% %creaimagebinary% %bbtkbinfolder%
-remcall compilemod.bat %buildtype% %creacontoursbinary%
+rem call compilemod.bat %buildtype% %creacontoursbinary%
 rem call ctestmod.bat %creacontoursbinary%
-set creacontourdll=%~dp0%creacontoursbinary%\%buildtype%
-set PATH=%creacontoursdll%;%PATH%
+rem set creacontourdll=%~dp0%creacontoursbinary%\%buildtype%
+rem set PATH=%creacontoursdll%;%PATH%
+
+rem creaRigidRegistration
+set crearigidregistrationssource=creaRigidRegistration
+set crearigidregistrationbinary=creaRigidRegistrationBin
+rem call cvscheckout.bat %crearigidregistrationssource%
+rem call cmakemod.bat %crearigidregistrationssource% %crearigidregistrationbinary%
+rem call creaRigidRegistrationVariables.bat %crearigidregistrationbinary% %creabinfolder% %bbtksourcefolder%
+rem call compilemod.bat %buildtype% %crearigidregistrationbinary%
+rem call ctestmod.bat %crearigidregistrationbinary%
+rem set crearigidregistrationdll=%~dp0%crearigidregistrationbinary%\%buildtype%
+rem set PATH=%crearigidregistrationdll%;%PATH%
+
+rem bbtkGEditor
+set bbtkgeditorsource=bbtkGEditor
+set bbtkgeditorbinary=bbtkGEditorBin
+rem call cvscheckout.bat %bbtkgeditorsource%
+rem call cmakemod.bat %bbtkgeditorsource% %bbtkgeditorbinary%
+rem call bbtkGEditorVariables.bat %bbtkgeditorbinary% %creasourcefolder% %bbtksourcefolder% %creamaracassourcefolder%
+rem call compilemod.bat %buildtype% %bbtkgeditorbinary%
+rem call ctestmod.bat %bbtkgeditorbinary%
+rem set bbtkgeditordll=%~dp0%bbtkgeditorbinary%\%buildtype%
+rem set PATH=%bbtkgeditordll%;%PATH%
 
 rem creaTools
 set creatoolssource=creaTools
@@ -87,10 +109,11 @@ call cvscheckout.bat %creatoolssource%
 call cmakemod.bat %creatoolssource% %creatoolsbinary%
 call creaToolsVariables.bat %creatoolsbinary%
 call compilemodCreaTools.bat %buildtype% %creatoolsbinary%
-rem call ctestmod.bat %creatoolsbinary%
+rem remcall ctestmod.bat %creatoolsbinary%
 set creatoolsdll=%~dp0%creatoolsbinary%\%buildtype%
 set PATH=%creatoolssdll%;%PATH%
 
 pause
+
 rem shutdown /s
 exit /b
\ No newline at end of file
diff --git a/ctest/dashboard/bbtkGEditorVariables.bat b/ctest/dashboard/bbtkGEditorVariables.bat
new file mode 100644
index 0000000..630d96d
--- /dev/null
+++ b/ctest/dashboard/bbtkGEditorVariables.bat
@@ -0,0 +1,11 @@
+rem %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk
+set currentdir=%~dp0
+set currentdir=%currentdir:\=/%
+
+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 ..
\ No newline at end of file
diff --git a/ctest/dashboard/compilemodCreaTools.bat b/ctest/dashboard/compilemodCreaTools.bat
new file mode 100644
index 0000000..f037fc5
--- /dev/null
+++ b/ctest/dashboard/compilemodCreaTools.bat
@@ -0,0 +1,4 @@
+cd %2
+call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj
+cd ..
diff --git a/ctest/dashboard/creaRigidRegistrationVariables.bat b/ctest/dashboard/creaRigidRegistrationVariables.bat
new file mode 100644
index 0000000..934c08a
--- /dev/null
+++ b/ctest/dashboard/creaRigidRegistrationVariables.bat
@@ -0,0 +1,8 @@
+rem %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk
+set currentdir=%~dp0
+set currentdir=%currentdir:\=/%
+
+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
+cd ..
\ No newline at end of file
diff --git a/ctest/dashboard/ctestmod.bat b/ctest/dashboard/ctestmod.bat
index d59d07b..d11db0a 100644
--- a/ctest/dashboard/ctestmod.bat
+++ b/ctest/dashboard/ctestmod.bat
@@ -1,9 +1,10 @@
 set binfolder=%1
 cd %binfolder%
-ctest -D ContinuousStart -D ContinuousUpdate -D ContinuousConfigure -D ContinuousBuild -D ContinuousTest -D ContinuousSubmit
-ctest -D ContinuousMemCheck -D ContinuousSubmit 
-ctest -D ExperimentalStart -D ExperimentalUpdate -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
-ctest -D ExperimentalMemCheck -D ExperimentalSubmit
+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
-ctest -D NightlyMemCheck -D NightlySubmit
+rem EED>> ctest -D NightlyMemCheck -D NightlySubmit
 cd ..
\ No newline at end of file