X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FAll.bat;h=38124bf9c0499d08a0a1a8cf7e4d2d1b561c53ae;hb=52d405722a2de46a53f5b5296dd9a9d1d9f3ebb4;hp=96e1985479f03e20c2c69cdb55e35820bffbb561;hpb=408ce0d93a1f7cf4e06d77e4dcc122e4a4965cc6;p=creaToolsTools.git diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat index 96e1985..38124bf 100644 --- a/Install/scripts/All.bat +++ b/Install/scripts/All.bat @@ -7,6 +7,7 @@ set buildtype=%1 set docgeneration=%2 set cvsUser=%3 + set creasourcefolder=crea set bbtksourcefolder=bbtk set creamaracassourcefolder=creaMaracasVisu @@ -21,9 +22,8 @@ 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 cleangeneral.bat %dirInstall% call cvscheckout.bat %creasourcefolder% %cvsUser% call cvscheckout.bat %bbtksourcefolder% %cvsUser% @@ -128,12 +128,11 @@ rem set PATH=%bbtkgeditordll%;%PATH% rem creaTools call cleanmod.bat %creatoolssource% call cmakemod.bat %creatoolssource% %dirInstall% -call creaToolsVariables.bat %creatoolssource% +call creaToolsVariables.bat %creatoolssource% %dirInstall% call compilemodCreaTools.bat %buildtype% %creatoolssource% rem remcall ctestmod.bat %creatoolssource% set creatoolsdll=%~dp0%creatoolssource%\%buildtype% set PATH=%creatoolssdll%;%PATH% - rem shutdown /s -exit /b +exit /b \ No newline at end of file