DFCH: Script changes

[creaToolsTools.git] / Install_ThirdParty / scripts / install_thirdparty_all.bat

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index ee93b89d3d9dcbde7b107ab7bbec1b47613fc755..2773812540bd5b462a378661db408a754b5adab2 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -61,8 +61,10 @@ set binpath=%thirdpartyGeneration%\thirdparty_bin
 set sourcepath=%thirdpartyGeneration%\thirdparty_source
 
 set qt=Qt-4.7.3
-set wxWidgets=wxWidgets-2.9.2
-set boost=Boost-1.47.0
+set buildWxWidgets28=1
+if %buildWxWidgets28%==1 set wxWidgets=wxWidgets-2.8.12
+if %buildWxWidgets28%==0 set wxWidgets=wxWidgets-2.9.2
+set boost=Boost-1.46.1
 set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
@@ -110,6 +112,7 @@ echo -----------------------------------
 
 
 call %vcvarsall%
+
 echo -----------------------------------
 echo -------Creating Folders------------
 echo -----------------------------------
@@ -132,15 +135,18 @@ echo -----------------------------------
 
 cd %thirdpartyGeneration%\thirdparty_source\
 %wgetPath% %urlCreatisSource%/qt-4.7.3.zip
-%wgetPath% %urlCreatisSource%/wxWidgets-2.9.2.7z
-%wgetPath% %urlCreatisSource%/boost_1_47_0.7z
+IF %buildWxWidgets28%==0 (
+  %wgetPath% %urlCreatisSource%/wxWidgets-2.9.2.7z
+) ELSE (
+  %wgetPath% %urlCreatisSource%/wxWidgets-2.8.12.tar.gz
+)
+%wgetPath% %urlCreatisSource%/boost_1_46_1.7z
 %wgetPath% %urlCreatisSource%/vtk-5.8.0.tar.gz
 %wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip
 %wgetPath% %urlCreatisSource%/gdcm_11_Oct_2011.tar.gz
 %wgetPath% %urlCreatisSource%/xerces-c-3.1.1.zip
 %wgetPath% %urlCreatisSource%/tth_exe.zip
 echo ------End Downloading Sources------
-
 echo -----------------------------------
 echo --------Qt Installation------------
 echo -----------------------------------
@@ -172,15 +178,25 @@ echo -----------------------------------
 echo ----------Extracting---------------
 
 cd %sourcepath%
-md %wxWidgets%
-cd %wxWidgets%
-%zipPath% x %sourcepath%\wxWidgets-2.9.2.7z
-del %sourcepath%\wxWidgets-2.9.2.7z
-
+IF %buildWxWidgets28%==0 (
+  md %wxWidgets%
+  cd %wxWidgets%
+  %zipPath% x %sourcepath%\wxWidgets-2.9.2.7z
+  del %sourcepath%\wxWidgets-2.9.2.7z
+) ELSE (
+ %zipPath% x %sourcepath%\wxWidgets-2.8.12.tar.gz
+ %zipPath% x %sourcepath%\wxWidgets-2.8.12.tar
+ del %sourcepath%\wxWidgets-2.8.12.tar.gz
+ del %sourcepath%\wxWidgets-2.8.12.tar
+)
 echo ----------Installing---------------
 
 cd %sourcepath%\%wxWidgets%\build\msw
-nmake -f makefile.vc BUILD=%buildType% UNICODE=1 SHARED=1
+IF %buildWxWidgets28%==0 (
+  nmake -f makefile.vc BUILD=%buildType% USE_OPENGL=1 USE_GUI=1 UNICODE=0 SHARED=1
+) ELSE (
+  nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1
+)
 cd C:\
 
 echo ----End wxWidgets Installation-----
@@ -191,12 +207,12 @@ echo -----------------------------------
 echo ----------Extracting---------------
 
 cd %sourcepath%
-%zipPath% x %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
-del %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\boost_1_46_1.7z
+del %thirdpartyGeneration%\thirdparty_source\boost_1_46_1.7z
 
 echo --------Renaming Folder------------
 
-rename boost_1_47_0 %boost%
+rename boost_1_46_1 %boost%
 
 echo ----------Installing---------------
 
@@ -204,8 +220,9 @@ mkdir %binpath%\%boost%Bin
 mkdir %installpath%\%boost%
 
 cd %sourcepath%\%boost%
+
 call bootstrap.bat
-b2.exe --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared --prefix=%installpath%\%boost% install
+bjam.exe --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared --prefix=%installpath%\%boost% install
 cd C:\
 
 echo -----End Boost Installation--------