From: Eduardo DAVILA Date: Wed, 6 Feb 2013 13:22:39 +0000 (+0100) Subject: Bug #1908 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=712c4d68630db18b68e813c09a988697b3c4033f;p=creaToolsTools.git Bug #1908 creatools not compiling boost version TPL installeurs --- diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE index c10e36d..792cebf 100644 --- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE +++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE @@ -1,79 +1,21 @@ + + @echo off echo ----------------------------------- echo ---Setting Environment Variables--- echo ----------------------------------- -set thirdpartyGeneration= +set thirdpartyGeneration=<..directory where you want to generate..> set buildType= -::The following line sets wxWidgets version. Set it ON if you want to compile wxWidgets 2.8.12 -::The following line set swxWidgets version. Set it OFF if you want to compile wxWidgets 2.9.3 -set wxStable= ::Set the following line ON if you want to force x86 compilation set forcex86= +call scripts/tpl_variables.bat -echo thirdpartyGeneration=%thirdpartyGeneration% -echo buildType=%buildType% -echo wxStable=%wxStable% - -echo ----------------------------------- -echo ---End Setting Global Variables---- -echo ----------------------------------- - -echo ----------------------------------- -echo -------Calling Scripts------------- -echo ----------------------------------- - -echo starting time -time /t -date /T - -set scripts=%cd%\scripts -set LogFolder=%thirdpartyGeneration%\installLog -cd %scripts% - -echo cleaning All - -call cleanAll.bat %thirdpartyGeneration% - -cd %scripts% - -echo Calling download_ThirdPartySW.bat - -call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >> %LogFolder%\downloadSources.log 2>&1 - -cd %scripts% - -echo Calling install_thirdparty.bat - -start /B /wait install_thirdparty_all.bat %thirdpartyGeneration% %buildType% %forcex86% - -echo Calling generateThirdPartydllsExe.bat - -cd %scripts% - -start /B /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86% - -echo Calling generateThirdPartyLibExe.bat - -cd %scripts% - -start /B /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86% - -cd.. - -echo ----------------------------------- -echo -------End of the Script----------- -echo ----------------------------------- - -echo ending time -time /t -date /T - -echo To see the log of this install please go to %LogFolder% +call scripts/makeAll.bat -::pause +pause -exit \ No newline at end of file +exit