From 0fe25c9c4af83976e3cd9be8ba4b7ce201e3b8fb Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Tue, 5 Oct 2010 22:16:47 +0000 Subject: [PATCH] *** empty log message *** --- ctest/dashboard/All.bat | 33 ++++++++++++++++++++----- ctest/dashboard/cleanmod.bat | 17 +++++++++++++ ctest/dashboard/compilemodCreaTools.bat | 2 +- ctest/dashboard/creaToolsVariables.bat | 2 +- 4 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 ctest/dashboard/cleanmod.bat diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat index 78a611b..17fd8f6 100644 --- a/ctest/dashboard/All.bat +++ b/ctest/dashboard/All.bat @@ -14,6 +14,11 @@ 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 + call cvscheckout.bat %creasourcefolder% %cvsUser% call cvscheckout.bat %bbtksourcefolder% %cvsUser% @@ -27,7 +32,10 @@ call cvscheckout.bat %bbtkgeditorsource% %cvsUser% call cvscheckout.bat %creatoolssource% %cvsUser% + + rem CREA +call cleanmod.bat %creasourcefolder% call cmakemod.bat %creasourcefolder% call creaVariables.bat %creasourcefolder% call compilemod.bat %buildtype% %creasourcefolder% @@ -38,6 +46,7 @@ set PATH=%creadll%;%PATH% rem BBTK +call cleanmod.bat %bbtksourcefolder% call cmakemod.bat %bbtksourcefolder% call bbtkVariables.bat %bbtksourcefolder% %docgeneration% call compilemod.bat %buildtype% %bbtksourcefolder% @@ -47,6 +56,7 @@ set bbtkdll=%bbtkdll%%bbtksourcefolder%Bin\%buildtype% set PATH=%bbtkdll%;%PATH% rem creaMaracasVisu +call cleanmod.bat %creamaracassourcefolder% call cmakemod.bat %creamaracassourcefolder% call creaMaracasVariables.bat %creamaracassourcefolder% %docgeneration% call compilemod.bat %buildtype% %creamaracassourcefolder% @@ -56,6 +66,7 @@ set PATH=%creamaracasdll%;%PATH% rem creaEnvironment +call cleanmod.bat %creaenvironmentsource% call cmakemod.bat %creaenvironmentsource% call creaenvironmentVariables.bat %creaenvironmentsource% call compilemod.bat %buildtype% %creaenvironmentsource% @@ -64,6 +75,7 @@ set creaenvironmentdll=%~dp0%creaenvironmentsource%\%buildtype% set PATH=%creaenvironmentdll%;%PATH% rem creaBruker +call cleanmod.bat %creabrukersource% call cmakemod.bat %creabrukersource% call creaBrukerVariables.bat %creabrukersource% %docgeneration% call compilemod.bat %buildtype% %creabrukersource% @@ -72,6 +84,7 @@ set creabrukerdll=%~dp0%creabrukersource%\%buildtype% set PATH=%creabrukerdll%;%PATH% rem creaImageIO +call cleanmod.bat %creaimagesourcefolder% call cmakemod.bat %creaimagesourcefolder% call creaImageIOVariables.bat %creaimagesourcefolder% %docgeneration% call compilemod.bat %buildtype% %creaimagesourcefolder% @@ -81,6 +94,7 @@ set PATH=%creaimagedll%;%PATH% rem creaContours +call cleanmod.bat %creacontourssource% call cmakemod.bat %creacontourssource% call creaContoursVariables.bat %creacontourssource% %docgeneration% call compilemod.bat %buildtype% %creacontourssource% @@ -89,6 +103,7 @@ set creacontourdll=%~dp0%creacontourssource%\%buildtype% rem set PATH=%creacontoursdll%;%PATH% rem creaRigidRegistration +call cleanmod.bat %crearigidregistrationssource% call cmakemod.bat %crearigidregistrationssource% call creaRigidRegistrationVariables.bat %crearigidregistrationssource% %docgeneration% call compilemod.bat %buildtype% %crearigidregistrationssource% @@ -97,6 +112,7 @@ rem set crearigidregistrationdll=%~dp0%crearigidregistrationssource%\%buildtype% rem set PATH=%crearigidregistrationdll%;%PATH% rem bbtkGEditor +call cleanmod.bat %bbtkgeditorsource% call cmakemod.bat %bbtkgeditorsource% call bbtkGEditorVariables.bat %bbtkgeditorsource% %docgeneration% call compilemod.bat %buildtype% %bbtkgeditorsource% @@ -104,15 +120,20 @@ call ctestmod.bat %bbtkgeditorsource% rem set bbtkgeditordll=%~dp0%bbtkgeditorsource%\%buildtype% rem set PATH=%bbtkgeditordll%;%PATH% -pause - rem creaTools +call cleanmod.bat %creatoolssource% +pause call cmakemod.bat %creatoolssource% -call creaToolsVariables.bat %creatoolsbinary% -call compilemodCreaTools.bat %buildtype% %creatoolsbinary% -rem remcall ctestmod.bat %creatoolsbinary% -set creatoolsdll=%~dp0%creatoolsbinary%\%buildtype% +pause +call creaToolsVariables.bat %creatoolssource% +pause +call compilemodCreaTools.bat %buildtype% %creatoolssource% +pause +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 diff --git a/ctest/dashboard/cleanmod.bat b/ctest/dashboard/cleanmod.bat new file mode 100644 index 0000000..7464c83 --- /dev/null +++ b/ctest/dashboard/cleanmod.bat @@ -0,0 +1,17 @@ +REM %1=creasourcefolder + +set binfolder=%1Bin +cd %binfolder% +del *.exe +del *.lib +del *.dll +del Debug\*.exe +del Debug\*.lib +del Debug\*.dll +del Release\*.exe +del Release\*.lib +del Release\*.dll +del RelWithDebInfo\*.exe +del RelWithDebInfo\*.lib +del RelWithDebInfo\*.dll +cd .. \ No newline at end of file diff --git a/ctest/dashboard/compilemodCreaTools.bat b/ctest/dashboard/compilemodCreaTools.bat index f037fc5..a9155c1 100644 --- a/ctest/dashboard/compilemodCreaTools.bat +++ b/ctest/dashboard/compilemodCreaTools.bat @@ -1,4 +1,4 @@ -cd %2 +cd %2Bin 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/creaToolsVariables.bat b/ctest/dashboard/creaToolsVariables.bat index 7da5799..685cd70 100644 --- a/ctest/dashboard/creaToolsVariables.bat +++ b/ctest/dashboard/creaToolsVariables.bat @@ -1,6 +1,6 @@ set currentdir=%~dp0 set currentdir=%currentdir:\=/% -cd %1 +cd %1Bin cmake -D CREATOOLS_SOURCE_PATH:PATH=%currentdir%/tmpCreaTools_INSTALL/ CMakeCache.txt cd .. \ No newline at end of file -- 2.45.1