Updating script DFCH

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index fa613b2e001384e685069035f7fcb3c182f58dc5..8012ae530b83a9e6fec1d0715bc9eebf7e7be12e 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -1,4 +1,6 @@
-rem ---Asking Architecture-------------
+rem -----------------------------------
+rem ------Asking Architecture----------
+rem -----------------------------------
 @echo off
 if %PROCESSOR_ARCHITECTURE%==x86 (
 @echo on
@@ -10,13 +12,15 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 @echo off
 )
 @echo on
+rem ----End Asking Architecture--------
 
-rem ----Setting Global Variables-------
+rem -----------------------------------
+rem ---Setting Enviroment Variables----
+rem -----------------------------------
 set thirdpartyGeneration=%1
 set buildType=%2
 
-set wgetPath=%~p0
-set wgetPath=%wgetPath%\..\..\windows\creaTools_win_installers\CreaTools_v2_0_0_win32_installer\bin
+set wgetPath=C:\Users\diego\Desktop\crea_Developer_Tools-3.0.0-win32\crea_Developer_Tools-3.0.0\wget.exe
 set zipPath="%ProgramFilesPath%\7-Zip\7z.exe"
 set urlCreatisSource=http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source
 set urlCreatisSource=http://www.creatis.insa-lyon.fr/~caceres/software
@@ -25,34 +29,54 @@ 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
 rem ---End Setting Global Variables----
+rem -----------------------------------
+
 call %vcvarsall%
 
+rem -----------------------------------
+rem -------Creating Folders------------
+rem -----------------------------------
 rmdir %binpath% /s /q
 
-
 rmdir %thirdpartyGeneration% /s /q
 mkdir %thirdpartyGeneration%
 cd  %thirdpartyGeneration%
 mkdir thirdparty_source
 mkdir thirdparty_bin
 mkdir thirdparty_install
+rem ------End Creating Folders---------
+
+rem -----------------------------------
+rem ------Downloading Sources----------
+rem -----------------------------------
+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
+%wgetPath% %urlCreatisSource%/vtk-5.6.1.zip
+%wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip
+%wgetPath% %urlCreatisSource%/gdcm_05_Mai_2011.tar.gz
+%wgetPath% %urlCreatisSource%/xerces-c-3.1.1.zip
+rem ------End Downloading Sources------
 
+rem -----------------------------------
 rem --------Qt Installation------------
-rem -------Setting Variables-----------
+rem -----------------------------------
+rem ---Setting Enviroment Variables----
 set QTDIR=%thirdpartyGeneration%\thirdparty_source\Qt\4.7.3\
-rem ----------Downloading--------------
+rem ----------Extracting---------------
 cd %thirdpartyGeneration%\thirdparty_source\
-md Qt\
+mkdir 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
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\qt-4.7.3.zip
+del %thirdpartyGeneration%\thirdparty_source\qt-4.7.3.zip
+
 rem --------Renaming Folder------------
 rename qt-everywhere-opensource-src-4.7.3 4.7.3
 rem ----------Installing---------------
@@ -61,34 +85,36 @@ echo y | configure -debug-and-release -opensource -shared -qt-sql-sqlite -phonon
 nmake
 cd C:\
 rem ------End QT Installation----------
+
+rem -----------------------------------
 rem -----wxWidgets Installation--------
+rem -----------------------------------
 rem -------Setting Variables-----------
 set WXDIR=%thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\
-rem ----------Downloading--------------
+rem ----------Extracting---------------
 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
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\wxWidgets-2.9.2.7z
+del %thirdpartyGeneration%\thirdparty_source\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 -----------------------------------
 rem ------Boost Installation-----------
+rem -----------------------------------
 rem -------Setting Variables-----------
 set BOOSTDIR=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
-rem ----------Downloading--------------
+rem ----------Extracting---------------
 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 
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
+del %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z 
 rem --------Renaming Folder------------
 rename boost_1_47_0 1.47.0
 rem ----------Installing---------------
@@ -100,36 +126,14 @@ b2 -j 2 --build-dir=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\boost-
 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 -----------------------------------
 rem -------VTK Installation------------
-rem ----------Downloading--------------
+rem -----------------------------------
+rem ----------Extracting---------------
 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
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\vtk-5.6.1.zip
+del %thirdpartyGeneration%\thirdparty_source\vtk-5.6.1.zip
 rem ----------Installing---------------
 cd  %binpath%
 mkdir %vtk%Bin
@@ -142,11 +146,12 @@ FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 cd c:\
 rem ------End VTK Installation---------
+
+rem -----------------------------------
 rem -------ITK Installation------------
-rem ----------Downloading--------------
-cd %thirdpartyGeneration%\thirdparty_source
-%wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip
+rem -----------------------------------
 rem ----------Extracting---------------
+cd %thirdpartyGeneration%\thirdparty_source
 %zipPath% x InsightToolkit-3.20.0.zip
 del InsightToolkit-3.20.0.zip
 rem ----------Installing---------------
@@ -161,17 +166,41 @@ FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 cd c:\
 rem ------End ITK Installation---------
-rem ------XERCES Installation----------
-rem ----------Downloading--------------
+
+rem -----------------------------------
+rem -------GDCM Installation-----------
+rem -----------------------------------
+rem -------Setting Variables-----------
+rem ----------Extracting---------------
 cd %thirdpartyGeneration%\thirdparty_source
-%wgetPath% %urlCreatisSource%/xerces-c-3.1.1.zip
+%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 VTK_DIR:PATH=%vtk% -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 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 -----------------------------------
+rem ------XERCES Installation----------
+rem -----------------------------------
 rem ----------Extracting---------------
+cd %thirdpartyGeneration%\thirdparty_source
 %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-------
+cd c:\
 pause