X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Finstall_generate_thirdparty.bat_TEMPLATE;h=792cebfc845dab936b665ee8675a5615fea5daf8;hb=67b3f4ea5bc09d317c6eda128b03e7c36a27a84c;hp=6ef05bea5acf2dbf98407e9c929577643ce3abb1;hpb=67a0a4de0e7d0b76e4bd6e1727da7802bb77fcf7;p=creaToolsTools.git

diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
index 6ef05be..792cebf 100644
--- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
+++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
@@ -1,70 +1,21 @@
-@echo off
-
-echo -----------------------------------
-echo ---Setting Environment Variables---
-echo -----------------------------------
-
-set thirdpartyGeneration=<directory where you want to generate>
-set buildType=<debug|release|RelWithDebInfo>
-::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=<ON|OFF>
-::Set the following line ON if you want to force x86 compilation
-set forcex86=OFF
 
 
-echo thirdpartyGeneration=%thirdpartyGeneration%
-echo buildType=%buildType%
-echo wxStable=%wxStable%
-
-echo -----------------------------------
-echo ---End Setting Global Variables----
-echo -----------------------------------
+@echo off
 
 echo -----------------------------------
-echo -------Calling Scripts-------------
+echo ---Setting Environment Variables---
 echo -----------------------------------
 
-echo starting time
-time /t
-date /T
-
-set scripts=%cd%\scripts
-
-cd %scripts%
+set thirdpartyGeneration=<..directory where you want to generate..>
+set buildType=<debug|release>
 
-echo Calling download_ThirdPartySW.bat
-
-call download_ThirdPartySW.bat %thirdpartyGeneration% %buildType% %wxStable% >> downloadThirdParty.log 2>&1
-
-cd %scripts%
-
-echo Calling install_thirdparty.bat
-
-start /wait install_thirdparty.bat %thirdpartyGeneration% %buildType%
-
-echo Calling generateThirdPartydllsExe.bat
-
-cd %scripts%
-
-start /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType%
-
-echo Calling generateThirdPartyLibExe.bat
-
-cd %scripts%
-
-start /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType%
-
-cd..
+::Set the following line ON if you want to force x86 compilation
+set forcex86=<ON|OFF>
 
-echo -----------------------------------
-echo -------End of the Script-----------
-echo -----------------------------------
+call scripts/tpl_variables.bat
 
-echo ending time
-time /t
-date /T
+call scripts/makeAll.bat
 
 pause
 
-exit
\ No newline at end of file
+exit