DFCH: Install_ThirdParty script is now working in windows x64 =)

[creaToolsTools.git] / Install_ThirdParty / install_generate_thirdparty.bat_TEMPLATE

diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
index 5915078c8d884f04ca8a82697c2ce8c6df8d8a24..37756bb61019b4e7e9a4fc6f4cc24b7db04691b8 100644 (file)
--- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
+++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
@@ -7,8 +7,16 @@ 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=<ON|OFF>
+
+
 echo thirdpartyGeneration=%thirdpartyGeneration%
 echo buildType=%buildType%
+echo wxStable=%wxStable%
 
 echo -----------------------------------
 echo ---End Setting Global Variables----
@@ -22,19 +30,37 @@ echo starting time
 time /t
 date /T
 
-cd scripts
+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 /wait install_thirdparty.bat %thirdpartyGeneration% %buildType%
+start /B /wait install_thirdparty_all.bat %thirdpartyGeneration% %buildType% %forcex86%
 
 echo Calling generateThirdPartydllsExe.bat
 
-start /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType%
+cd %scripts%
+
+start /B /wait generateThirdPartydllsExe.bat %thirdpartyGeneration% %buildType% %forcex86%
 
 echo Calling generateThirdPartyLibExe.bat
 
-start /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType%
+cd %scripts%
+
+start /B /wait generateThirdPartyLibExe.bat %thirdpartyGeneration% %buildType% %forcex86%
 
 cd..
 
@@ -46,6 +72,8 @@ echo ending time
 time /t
 date /T
 
-pause
+echo To see the log of this install please go to %LogFolder%
+
+::pause
 
 exit
\ No newline at end of file