From: Eduardo Davila Date: Mon, 30 Aug 2010 21:38:32 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~74 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c23d0f60e99a71e10390172d8d3ba721c1c786f4;p=creaToolsTools.git *** empty log message *** --- diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat index 8dd80c4..8f4aff1 100644 --- a/ctest/dashboard/All.bat +++ b/ctest/dashboard/All.bat @@ -1,14 +1,14 @@ -@echo off +rem @echo off set buildtype=Release rem CREA set creasourcefolder=crea set creabinfolder=creaBin -call cvscheckout.bat %creasourcefolder% -call cmakemod.bat %creasourcefolder% %creabinfolder% -call creaVariables.bat %creabinfolder% %creasourcefolder% -call compilemod.bat %buildtype% %creabinfolder% -call ctestmod.bat %creabinfolder% +rem call cvscheckout.bat %creasourcefolder% +rem call cmakemod.bat %creasourcefolder% %creabinfolder% +rem call creaVariables.bat %creabinfolder% %creasourcefolder% +rem call compilemod.bat %buildtype% %creabinfolder% +rem call ctestmod.bat %creabinfolder% set creadll=%~dp0 set creadll=%creadll%%creabinfolder%\%buildtype% set PATH=%creadll%;%PATH% @@ -16,11 +16,11 @@ set PATH=%creadll%;%PATH% rem BBTK set bbtksourcefolder=bbtk set bbtkbinfolder=bbtkBin -call cvscheckout.bat %bbtksourcefolder% -call cmakemod.bat %bbtksourcefolder% %bbtkbinfolder% -call bbtkVariables.bat %bbtkbinfolder% %creabinfolder% -call compilemod.bat %buildtype% %bbtkbinfolder% -call ctestmod.bat %bbtkbinfolder% +rem call cvscheckout.bat %bbtksourcefolder% +rem call cmakemod.bat %bbtksourcefolder% %bbtkbinfolder% +rem call bbtkVariables.bat %bbtkbinfolder% %creabinfolder% +rem call compilemod.bat %buildtype% %bbtkbinfolder% +rem call ctestmod.bat %bbtkbinfolder% set bbtkdll=%~dp0 set bbtkdll=%bbtkdll%%bbtkbinfolder%\%buildtype% set PATH=%bbtkdll%;%PATH% @@ -28,55 +28,69 @@ set PATH=%bbtkdll%;%PATH% rem creaMaracasVisu set creamaracassourcefolder=creaMaracasVisu set creamaracasbinary=creaMaracasVisuBin -call cvscheckout.bat %creamaracassourcefolder% -call cmakemod.bat %creamaracassourcefolder% %creamaracasbinary% -call creaMaracasVariables.bat %creamaracasbinary% %creabinfolder% %bbtkbinfolder% -call compilemod.bat %buildtype% %creamaracasbinary% -call ctestmod.bat %creamaracasbinary% +rem call cvscheckout.bat %creamaracassourcefolder% +rem call cmakemod.bat %creamaracassourcefolder% %creamaracasbinary% +rem call creaMaracasVariables.bat %creamaracasbinary% %creabinfolder% %bbtkbinfolder% +rem call compilemod.bat %buildtype% %creamaracasbinary% +rem call ctestmod.bat %creamaracasbinary% set creamaracasdll=%~dp0%creamaracasbinary%\%buildtype% set PATH=%creamaracasdll%;%PATH% rem creaEnvironment set creaenvironmentsource=creaEnvironment set creaenvironmentbinary=creaEnvironmentBin -call cvscheckout.bat %creaenvironmentsource% -call cmakemod.bat %creaenvironmentsource% %creaenvironmentbinary% -call creaenvironmentVariables.bat %creaenvironmentbinary% %creabinfolder% -call compilemod.bat %buildtype% %creaenvironmentbinary% -call ctestmod.bat %creaenvironmentbinary% +rem call cvscheckout.bat %creaenvironmentsource% +rem call cmakemod.bat %creaenvironmentsource% %creaenvironmentbinary% +rem call creaenvironmentVariables.bat %creaenvironmentbinary% %creabinfolder% +rem call compilemod.bat %buildtype% %creaenvironmentbinary% +rem call ctestmod.bat %creaenvironmentbinary% set creaenvironmentdll=%~dp0%creaenvironmentbinary%\%buildtype% set PATH=%creaenvironmentdll%;%PATH% rem creaBruker set creabrukersource=creaBruker set creabrukerbinary=creaBrukerBin -call cvscheckout.bat %creabrukersource% -call cmakemod.bat %creabrukersource% %creabrukerbinary% -call creaenvironmentVariables.bat %creabrukerbinary% %creabinfolder% -call compilemod.bat %buildtype% %creabrukerbinary% -call ctestmod.bat %creabrukerbinary% +rem call cvscheckout.bat %creabrukersource% +rem call cmakemod.bat %creabrukersource% %creabrukerbinary% +rem call creaenvironmentVariables.bat %creabrukerbinary% %creabinfolder% +rem call compilemod.bat %buildtype% %creabrukerbinary% +rem call ctestmod.bat %creabrukerbinary% set creabrukerdll=%~dp0%creabrukerbinary%\%buildtype% set PATH=%creabrukerdll%;%PATH% rem creaImageIO set creaimagesourcefolder=creaImageIO set creaimagebinary=creaImageIOBin -call cvscheckout.bat %creaimagesourcefolder% -call cmakemod.bat %creaimagesourcefolder% %creaimagebinary% -call creaImageIOVariables.bat %creaimagebinary% %creabinfolder% %bbtkbinfolder% %creabrukerbinary% -call compilemod.bat %buildtype% %creaimagebinary% -call ctestmod.bat %creaimagebinary% +rem call cvscheckout.bat %creaimagesourcefolder% +rem call cmakemod.bat %creaimagesourcefolder% %creaimagebinary% +rem call creaImageIOVariables.bat %creaimagebinary% %creabinfolder% %bbtkbinfolder% %creabrukerbinary% +rem call compilemod.bat %buildtype% %creaimagebinary% +rem call ctestmod.bat %creaimagebinary% set creaimagedll=%~dp0%creaimagebinary%\%buildtype% set PATH=%creaimagedll%;%PATH% rem creaContours set creacontourssource=creaContours set creacontoursbinary=creaContoursBin -call cvscheckout.bat %creacontourssource% -call cmakemod.bat %creacontourssource% %creacontoursbinary% -call creaContoursVariables.bat %creacontoursbinary% %creabinfolder% %creaenvironmentbinary% %creamaracasbinary% %creaimagebinary% %bbtkbinfolder% -call compilemod.bat %buildtype% %creacontoursbinary% -call ctestmod.bat %creacontoursbinary% +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 ctestmod.bat %creacontoursbinary% +set creacontourdll=%~dp0%creacontoursbinary%\%buildtype% +set PATH=%creacontoursdll%;%PATH% +rem creaTools +set creatoolssource=creaTools +set creatoolsbinary=creaToolsBin +call cvscheckout.bat %creatoolssource% +call cmakemod.bat %creatoolssource% %creatoolsbinary% +call creaToolsVariables.bat %creatoolsbinary% +call compilemodCreaTools.bat %buildtype% %creatoolsbinary% +rem call 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/creaMaracasVariables.bat b/ctest/dashboard/creaMaracasVariables.bat index c44340d..99f2813 100644 --- a/ctest/dashboard/creaMaracasVariables.bat +++ b/ctest/dashboard/creaMaracasVariables.bat @@ -3,7 +3,7 @@ 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=ON CMakeCache.txt +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 cmake CMakeCache.txt diff --git a/ctest/dashboard/creaToolsVariables.bat b/ctest/dashboard/creaToolsVariables.bat new file mode 100644 index 0000000..7da5799 --- /dev/null +++ b/ctest/dashboard/creaToolsVariables.bat @@ -0,0 +1,6 @@ +set currentdir=%~dp0 +set currentdir=%currentdir:\=/% + +cd %1 +cmake -D CREATOOLS_SOURCE_PATH:PATH=%currentdir%/tmpCreaTools_INSTALL/ CMakeCache.txt +cd .. \ No newline at end of file