X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=ctest%2Fdashboard%2FAll.bat;h=ae4c828eddf7b0d1313db0a3f14a0b10bd9d2111;hb=d9bbd856b648fb29ffefed7ac0d971aedbfa6a91;hp=78a611bf2f173ab4f2965e03338cb5175f0e6a05;hpb=8a41f1e8852f4c732eb09caff7207bd38094662d;p=creaToolsTools.git

diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat
index 78a611b..ae4c828 100644
--- a/ctest/dashboard/All.bat
+++ b/ctest/dashboard/All.bat
@@ -14,6 +14,12 @@ set crearigidregistrationssource=creaRigidRegistration
 set bbtkgeditorsource=bbtkGEditor
 set creatoolssource=creaTools
 
+set currentdir=%~dp0
+rem set currentdir=%currentdir:\=/%
+set dirInstall=%currentdir%\tmpCreaTools_INSTALL
+rmdir  %dirInstall% /s /q
+rmdir  Result_Installers /s /q
+mkdir Result_Installers
 
 call cvscheckout.bat %creasourcefolder% %cvsUser%
 call cvscheckout.bat %bbtksourcefolder% %cvsUser%
@@ -27,8 +33,11 @@ call cvscheckout.bat %bbtkgeditorsource% %cvsUser%
 call cvscheckout.bat %creatoolssource% %cvsUser%
 
 
+
+
 rem CREA
-call cmakemod.bat %creasourcefolder% 
+call cleanmod.bat %creasourcefolder%
+call cmakemod.bat %creasourcefolder% %dirInstall%
 call creaVariables.bat %creasourcefolder% 
 call compilemod.bat %buildtype% %creasourcefolder%
 call ctestmod.bat %creasourcefolder%
@@ -38,7 +47,8 @@ set PATH=%creadll%;%PATH%
 
 
 rem BBTK
-call cmakemod.bat %bbtksourcefolder% 
+call cleanmod.bat %bbtksourcefolder%
+call cmakemod.bat %bbtksourcefolder%  %dirInstall%
 call bbtkVariables.bat %bbtksourcefolder% %docgeneration%
 call compilemod.bat %buildtype% %bbtksourcefolder%
 call ctestmod.bat %bbtksourcefolder%
@@ -47,7 +57,8 @@ set bbtkdll=%bbtkdll%%bbtksourcefolder%Bin\%buildtype%
 set PATH=%bbtkdll%;%PATH%
 
 rem creaMaracasVisu
-call cmakemod.bat %creamaracassourcefolder% 
+call cleanmod.bat %creamaracassourcefolder%
+call cmakemod.bat %creamaracassourcefolder%  %dirInstall%
 call creaMaracasVariables.bat %creamaracassourcefolder% %docgeneration%
 call compilemod.bat %buildtype% %creamaracassourcefolder%
 call ctestmod.bat %creamaracassourcefolder%
@@ -56,7 +67,8 @@ set PATH=%creamaracasdll%;%PATH%
 
 
 rem creaEnvironment
-call cmakemod.bat %creaenvironmentsource% 
+call cleanmod.bat %creaenvironmentsource%
+call cmakemod.bat %creaenvironmentsource%  %dirInstall%
 call creaenvironmentVariables.bat %creaenvironmentsource% 
 call compilemod.bat %buildtype% %creaenvironmentsource%
 call ctestmod.bat %creaenvironmentsource%
@@ -64,7 +76,8 @@ set creaenvironmentdll=%~dp0%creaenvironmentsource%\%buildtype%
 set PATH=%creaenvironmentdll%;%PATH%
 
 rem creaBruker
-call cmakemod.bat %creabrukersource% 
+call cleanmod.bat %creabrukersource%
+call cmakemod.bat %creabrukersource%  %dirInstall%
 call creaBrukerVariables.bat %creabrukersource% %docgeneration%
 call compilemod.bat %buildtype% %creabrukersource%
 call ctestmod.bat %creabrukersource%
@@ -72,7 +85,8 @@ set creabrukerdll=%~dp0%creabrukersource%\%buildtype%
 set PATH=%creabrukerdll%;%PATH%
 
 rem creaImageIO
-call cmakemod.bat %creaimagesourcefolder% 
+call cleanmod.bat %creaimagesourcefolder%
+call cmakemod.bat %creaimagesourcefolder%  %dirInstall%
 call creaImageIOVariables.bat %creaimagesourcefolder% %docgeneration% 
 call compilemod.bat %buildtype% %creaimagesourcefolder%
 call ctestmod.bat %creaimagesourcefolder%
@@ -81,7 +95,8 @@ set PATH=%creaimagedll%;%PATH%
 
 
 rem creaContours
-call cmakemod.bat %creacontourssource% 
+call cleanmod.bat %creacontourssource%
+call cmakemod.bat %creacontourssource%  %dirInstall%
 call creaContoursVariables.bat %creacontourssource% %docgeneration%
 call compilemod.bat %buildtype% %creacontourssource%
 call ctestmod.bat %creacontourssource%
@@ -89,7 +104,8 @@ set creacontourdll=%~dp0%creacontourssource%\%buildtype%
 rem set PATH=%creacontoursdll%;%PATH%
 
 rem creaRigidRegistration
-call cmakemod.bat %crearigidregistrationssource% 
+call cleanmod.bat %crearigidregistrationssource%
+call cmakemod.bat %crearigidregistrationssource%  %dirInstall%
 call creaRigidRegistrationVariables.bat %crearigidregistrationssource% %docgeneration% 
 call compilemod.bat %buildtype% %crearigidregistrationssource%
 call ctestmod.bat %crearigidregistrationssource%
@@ -97,22 +113,24 @@ rem set crearigidregistrationdll=%~dp0%crearigidregistrationssource%\%buildtype%
 rem set PATH=%crearigidregistrationdll%;%PATH%
 
 rem bbtkGEditor
-call cmakemod.bat %bbtkgeditorsource% 
+call cleanmod.bat %bbtkgeditorsource%
+call cmakemod.bat %bbtkgeditorsource%  %dirInstall%
 call bbtkGEditorVariables.bat %bbtkgeditorsource% %docgeneration% 
 call compilemod.bat %buildtype% %bbtkgeditorsource%
 call ctestmod.bat %bbtkgeditorsource%
 rem set bbtkgeditordll=%~dp0%bbtkgeditorsource%\%buildtype%
 rem set PATH=%bbtkgeditordll%;%PATH%
 
-pause
-
 rem creaTools
-call cmakemod.bat %creatoolssource% 
-call creaToolsVariables.bat %creatoolsbinary%
-call compilemodCreaTools.bat %buildtype% %creatoolsbinary%
-rem remcall ctestmod.bat %creatoolsbinary%
-set creatoolsdll=%~dp0%creatoolsbinary%\%buildtype%
+call cleanmod.bat %creatoolssource%
+call cmakemod.bat %creatoolssource%  %dirInstall%
+call creaToolsVariables.bat %creatoolssource%  %dirInstall%
+call compilemodCreaTools.bat %buildtype% %creatoolssource%
+rem remcall ctestmod.bat %creatoolssource%
+set creatoolsdll=%~dp0%creatoolssource%\%buildtype%
 set PATH=%creatoolssdll%;%PATH%
 
+pause
+
 rem shutdown /s
 exit /b
\ No newline at end of file