From: Eduardo Davila Date: Fri, 13 May 2011 08:45:45 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4693c07c862e23f1b4ff13d13c978e6a6f5421c2;hp=1168f1f973a54bc6c445d43b52c5997c688820e8;p=creaToolsTools.git *** empty log message *** --- diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat index 7aa06e8..00ee33f 100644 --- a/Install/scripts/All.bat +++ b/Install/scripts/All.bat @@ -21,6 +21,9 @@ set creatoolssource=creaTools set creaminitoolssource=creaMiniTools set currentdir=%~dp0 + +goto creaMiniToolDoIt + call %currentdir%\cleangeneral.bat %creatoolsGeneration% %installPrefix% @@ -117,6 +120,19 @@ call %currentdir%\ctestmod.bat %bbtkgeditorsource% %creatoolsGeneration% set bbtkgeditordll=%creatoolsGeneration%\creatools_bin\%bbtkgeditorsource%Bin\%buildtype% rem set PATH=%bbtkgeditordll%;%PATH% +:creaMiniToolDoIt + +rem creaMiniTools +call %currentdir%\cleanmod.bat %creaminitoolssource% %creatoolsGeneration% +call %currentdir%\cmakemod.bat %creaminitoolssource% %installPrefix% %creatoolsGeneration% +call %currentdir%\creaMiniToolsVariables.bat %creatoolsGeneration% %creaminitoolssource% %docgeneration% +call %currentdir%\compilemod.bat %buildtype% %creaminitoolssource% %creatoolsGeneration% +call %currentdir%\ctestmod.bat %creaminitoolssource% %creatoolsGeneration% +set creaminitoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% +rem set PATH=%creaminitoolsdll%;%PATH% + +rem THIS HAS TO BE THE LAST STEP... + rem creaTools call %currentdir%\cleanmod.bat %creatoolssource% %creatoolsGeneration% call %currentdir%\cmakemod.bat %creatoolssource% %installPrefix% %creatoolsGeneration% @@ -126,14 +142,6 @@ rem remcall ctestmod.bat %creatoolssource% %creatoolsGeneration% set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype% rem set PATH=%creatoolssdll%;%PATH% -rem creaMiniTools -call %currentdir%\cleanmod.bat %creaminitoolssource% %creatoolsGeneration% -call %currentdir%\cmakemod.bat %creaminitoolssource% %installPrefix% %creatoolsGeneration% -call %currentdir%\creaMiniToolsVariables.bat %creatoolsGeneration% %creatoolssource% %docgeneration% -call %currentdir%\compilemodCreaTools.bat %buildtype% %creatoolssource% %creatoolsGeneration% -rem remcall ctestmod.bat %creaminitoolssource% %creatoolsGeneration% -set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creaminitoolssource%Bin\%buildtype% -rem set PATH=%creatoolssdll%;%PATH% REM REM REM ...FIN...END... :)