Script changes (DFCH)

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 6d049861accd8d6759f406eb8d256c11a8f1bfee..fa613b2e001384e685069035f7fcb3c182f58dc5 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -1,25 +1,36 @@
+rem ---Asking Architecture-------------
+@echo off
+if %PROCESSOR_ARCHITECTURE%==x86 (
+@echo on
+  set ProgramFilesPath=%ProgramFiles%
+@echo off
+) else (
+@echo on
+  set ProgramFilesPath=%ProgramFiles(x86)%
+@echo off
+)
+@echo on
+
+rem ----Setting Global Variables-------
 set thirdpartyGeneration=%1
 set buildType=%2
 
-
-set QTDIR=C:\Qt\2010.05\qt
 set wgetPath=%~p0
 set wgetPath=%wgetPath%\..\..\windows\creaTools_win_installers\CreaTools_v2_0_0_win32_installer\bin
-set zipPath="%ProgramFiles(x86)%\7-Zip"
+set zipPath="%ProgramFilesPath%\7-Zip\7z.exe"
 set urlCreatisSource=http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source
-set vcvarsall="%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC"\vcvarsall.bat
+set urlCreatisSource=http://www.creatis.insa-lyon.fr/~caceres/software
+set vcvarsall="%ProgramFilesPath%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 
 set installpath=%thirdpartyGeneration%\thirdparty_install
 set binpath=%thirdpartyGeneration%\thirdparty_bin
 set sourcepath=%thirdpartyGeneration%\thirdparty_source
-
 set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
 set vtk=VTK
-
-
-goto next
+rem ---End Setting Global Variables----
+call %vcvarsall%
 
 rmdir %binpath% /s /q
 
@@ -31,65 +42,136 @@ mkdir thirdparty_source
 mkdir thirdparty_bin
 mkdir thirdparty_install
 
-cd thirdparty_source
-
-rem ---------DOWNLOAD------------------
-%wgetPath%\wget.exe %urlCreatisSource%/xerces-c-3.1.1.zip
-%wgetPath%\wget.exe %urlCreatisSource%/InsightToolkit-3.20.0.tar.gz
-%wgetPath%\wget.exe %urlCreatisSource%/gdcm_08_Dic_2009.tar.gz
-%wgetPath%\wget.exe %urlCreatisSource%/vtk-5.6.1.tar.gz
-%wgetPath%\wget.exe %urlCreatisSource%/wxWidgets-2.9.1.7z
-
-rem ---------Extracting------------------
-
-%zipPath%\7z.exe x xerces-c-3.1.1.zip
-%zipPath%\7z.exe x InsightToolkit-3.20.0.tar.gz
-%zipPath%\7z.exe x InsightToolkit-3.20.0.tar
-%zipPath%\7z.exe x gdcm_08_Dic_2009.tar.gz
-%zipPath%\7z.exe x gdcm_08_Dic_2009.tar
-%zipPath%\7z.exe x vtk-5.6.1.tar.gz
-%zipPath%\7z.exe x vtk-5.6.1.tar
-mkdir wxWidgets
-cd wxWidgets
-%zipPath%\7z.exe x ..\wxWidgets-2.9.1.7z
-
-
-rem -------------  vtk  --------------------
+rem --------Qt Installation------------
+rem -------Setting Variables-----------
+set QTDIR=%thirdpartyGeneration%\thirdparty_source\Qt\4.7.3\
+rem ----------Downloading--------------
+cd %thirdpartyGeneration%\thirdparty_source\
+md Qt\
+cd Qt\
+%wgetPath% %urlCreatisSource%/qt-4.7.3.zip
+rem ----------Extracting---------------
+%zipPath% x qt-4.7.3.zip
+del qt-4.7.3.zip
+rem --------Renaming Folder------------
+rename qt-everywhere-opensource-src-4.7.3 4.7.3
+rem ----------Installing---------------
+cd 4.7.3
+echo y | configure -debug-and-release -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
+nmake
+cd C:\
+rem ------End QT Installation----------
+rem -----wxWidgets Installation--------
+rem -------Setting Variables-----------
+set WXDIR=%thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\
+rem ----------Downloading--------------
+cd %thirdpartyGeneration%\thirdparty_source
+md wxWidgets\2.9.2
+cd wxWidgets\2.9.2
+%wgetPath% %urlCreatisSource%/wxWidgets-2.9.2.7z
+rem ----------Extracting---------------
+%zipPath% x wxWidgets-2.9.2.7z
+del wxWidgets-2.9.2.7z
+rem ----------Installing---------------
+cd %thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\build\msw
+nmake -f makefile.vc BUILD=debug UNICODE=1 SHARED=1
+nmake -f makefile.vc BUILD=release UNICODE=1 SHARED=1
+cd C:\
+rem ----End wxWidgets Installation-----
+rem ------Boost Installation-----------
+rem -------Setting Variables-----------
+set BOOSTDIR=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
+rem ----------Downloading--------------
+cd %thirdpartyGeneration%\thirdparty_source\
+md Boost\
+cd Boost\
+%wgetPath% %urlCreatisSource%/boost_1_47_0.7z
+rem ----------Extracting---------------
+%zipPath% x boost_1_47_0.7z
+del boost_1_47_0.7z 
+rem --------Renaming Folder------------
+rename boost_1_47_0 1.47.0
+rem ----------Installing---------------
+cd %thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
+md boost-build
+cd tools\build\v2
+call bootstrap.bat
+b2 -j 2 --build-dir=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\boost-build toolset=msvc --build-type=msvc install --prefix=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\boost-build
+cd C:\
+rem -----End Boost Installation--------
+
+rem -------GDCM Installation-----------
+rem -------Setting Variables-----------
+rem ----------Downloading--------------
+cd %thirdpartyGeneration%\thirdparty_source
+%wgetPath% %urlCreatisSource%/gdcm_05_Mai_2011.tar.gz
+rem ----------Extracting---------------
+%zipPath% x gdcm_05_Mai_2011.tar.gz
+%zipPath% x gdcm_05_Mai_2011.tar
+del gdcm_05_Mai_2011.tar.gz
+del gdcm_05_Mai_2011.tar
+rem ----------Installing---------------
+cd  %binpath%
+mkdir %gdcm%Bin
+cd %gdcm%Bin
+cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%gdcm%Bin 
+cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%gdcm%\ CMakeCache.txt
+cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
+cmake CMakeCache.txt
+FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
+msbuild /p:Configuration=%buildType% INSTALL.vcxproj
+cd c:\
+rem -----End GDCM Installation---------
+rem -------VTK Installation------------
+rem ----------Downloading--------------
+mkdir %thirdpartyGeneration%\thirdparty_source\VTK
+cd %thirdpartyGeneration%\thirdparty_source\VTK
+%wgetPath% %urlCreatisSource%/vtk-5.6.1.zip
+rem ----------Extracting---------------
+%zipPath% x vtk-5.6.1.zip
+del vtk-5.6.1.zip
+rem ----------Installing---------------
 cd  %binpath%
 mkdir %vtk%Bin
 cd %vtk%Bin
-cmake -G"Visual Studio 10 Win64"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin 
+cmake -G"Visual Studio 10"  -H%sourcepath%\%vtk% -B%binpath%\%vtk%Bin 
 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt
 cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
 cmake CMakeCache.txt
-call %vcvarsall%
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
-
-
-
-rem -------------  itk  --------------------
+cd c:\
+rem ------End VTK Installation---------
+rem -------ITK Installation------------
+rem ----------Downloading--------------
+cd %thirdpartyGeneration%\thirdparty_source
+%wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip
+rem ----------Extracting---------------
+%zipPath% x InsightToolkit-3.20.0.zip
+del InsightToolkit-3.20.0.zip
+rem ----------Installing---------------
 cd  %binpath%
 mkdir %itk%Bin
 cd %itk%Bin
-cmake -G"Visual Studio 9 2008 Win64" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin 
+cmake -G"Visual Studio 10" -H%sourcepath%\%itk% -B%binpath%\%itk%Bin 
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
 cmake -D USE_DEBUG_LIB:BOOL=%buildType% CMakeCache.txt
 cmake CMakeCache.txt
-call %vcvarsall%
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
-
-
-
-:next
-
-
-rem -------------  xercesc  --------------------
-cd  %sourcepath%\%xercesc%
-call %vcvarsall%
+cd c:\
+rem ------End ITK Installation---------
+rem ------XERCES Installation----------
+rem ----------Downloading--------------
+cd %thirdpartyGeneration%\thirdparty_source
+%wgetPath% %urlCreatisSource%/xerces-c-3.1.1.zip
+rem ----------Extracting---------------
+%zipPath% x xerces-c-3.1.1.zip
+del xerces-c-3.1.1.zip
+rem ----------Installing---------------
+cd  %sourcepath%\%xercesc%\projects\Win32\VC10\xerces-all
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 REM msbuild /p:Configuration=%buildType% INSTALL.vcxproj
-
-
+cd c:\
+rem -----End XERCES Installation-------
 pause