DFCH: Script significant changes! (Working)

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 32325651d1c353b1650bbea6dea422b6d13d9ddd..0086fbe2cea9a2490aa9ceb626762797ff9551df 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -1,7 +1,7 @@
-rem -----------------------------------
-rem ------Asking Architecture----------
-rem -----------------------------------
 @echo off
+echo -----------------------------------
+echo ------Asking Architecture----------
+echo -----------------------------------
 if %PROCESSOR_ARCHITECTURE%==x86 (
 @echo on
   set ProgramFilesPath=%ProgramFiles%
@@ -11,12 +11,14 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
   set "ProgramFilesPath=%ProgramFiles(x86)%"
 @echo off
 )
-@echo on
-rem ----End Asking Architecture--------
 
-rem -----------------------------------
-rem ---Setting Enviroment Variables----
-rem -----------------------------------
+echo ----End Asking Architecture--------
+
+echo -----------------------------------
+echo ---Setting Enviroment Variables----
+echo -----------------------------------
+
+@echo on
 set thirdpartyGeneration=%1
 set buildType=%2
 
@@ -35,14 +37,17 @@ set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
 set vtk=VTK
 
-rem ---End Setting Global Variables----
-rem -----------------------------------
-
+@echo off
+echo ---End Setting Global Variables----
+echo -----------------------------------
+@echo on
 call %vcvarsall%
 
-rem -----------------------------------
-rem -------Creating Folders------------
-rem -----------------------------------
+@echo off
+echo -----------------------------------
+echo -------Creating Folders------------
+echo -----------------------------------
+@echo on
 rmdir %binpath% /s /q
 
 rmdir %thirdpartyGeneration% /s /q
@@ -51,73 +56,98 @@ cd  %thirdpartyGeneration%
 mkdir thirdparty_source
 mkdir thirdparty_bin
 mkdir thirdparty_install
-rem ------End Creating Folders---------
 
-rem -----------------------------------
-rem ------Downloading Sources----------
-rem -----------------------------------
+@echo off
+echo ------End Creating Folders---------
+
+echo -----------------------------------
+echo ------Downloading Sources----------
+echo -----------------------------------
+@echo on
 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%/vtk-5.8.0.tar.gz
 %wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip
-%wgetPath% %urlCreatisSource%/gdcm_05_Mai_2011.tar.gz
+%wgetPath% %urlCreatisSource%/gdcm.tar.gz
 %wgetPath% %urlCreatisSource%/xerces-c-3.1.1.zip
-rem ------End Downloading Sources------
 
-rem -----------------------------------
-rem --------Qt Installation------------
-rem -----------------------------------
-rem ---Setting Enviroment Variables----
+@echo off
+echo ------End Downloading Sources------
+
+echo -----------------------------------
+echo --------Qt Installation------------
+echo -----------------------------------
+echo ---Setting Enviroment Variables----
+@echo on
 set QTDIR=%thirdpartyGeneration%\thirdparty_source\Qt\4.7.3\
-rem ----------Extracting---------------
+@echo off
+echo ----------Extracting---------------
+@echo on
 cd %thirdpartyGeneration%\thirdparty_source\
 mkdir Qt\
 cd Qt\
 %zipPath% x %thirdpartyGeneration%\thirdparty_source\qt-4.7.3.zip
 del %thirdpartyGeneration%\thirdparty_source\qt-4.7.3.zip
-
-rem --------Renaming Folder------------
+@echo off
+echo --------Renaming Folder------------
+@echo on
 rename qt-everywhere-opensource-src-4.7.3 4.7.3
-rem ----------Installing---------------
+@echo off
+echo ----------Installing---------------
+@echo on
 cd 4.7.3
 echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
 nmake
 cd C:\
-rem ------End QT Installation----------
+@echo off
+echo ------End QT Installation----------
 
-rem -----------------------------------
-rem -----wxWidgets Installation--------
-rem -----------------------------------
-rem -------Setting Variables-----------
+echo -----------------------------------
+echo -----wxWidgets Installation--------
+echo -----------------------------------
+echo -------Setting Variables-----------
+@echo on
 set WXDIR=%thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\
-rem ----------Extracting---------------
+@echo off
+echo ----------Extracting---------------
+@echo on
 cd %thirdpartyGeneration%\thirdparty_source
 md wxWidgets\2.9.2
 cd wxWidgets\2.9.2
 %zipPath% x %thirdpartyGeneration%\thirdparty_source\wxWidgets-2.9.2.7z
 del %thirdpartyGeneration%\thirdparty_source\wxWidgets-2.9.2.7z
-rem ----------Installing---------------
+@echo off
+echo ----------Installing---------------
+@echo on
 cd %thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\build\msw
 nmake -f makefile.vc BUILD=%buildType% UNICODE=1 SHARED=1
 cd C:\
-rem ----End wxWidgets Installation-----
+@echo off
+echo ----End wxWidgets Installation-----
 
-rem -----------------------------------
-rem ------Boost Installation-----------
-rem -----------------------------------
-rem -------Setting Variables-----------
+echo -----------------------------------
+echo ------Boost Installation-----------
+echo -----------------------------------
+echo -------Setting Variables-----------
+@echo on
 set BOOSTDIR=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
-rem ----------Extracting---------------
+@echo off
+echo ----------Extracting---------------
+@echo on
 cd %thirdpartyGeneration%\thirdparty_source\
 md Boost\
 cd Boost\
 %zipPath% x %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
-del %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z 
-rem --------Renaming Folder------------
+del %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
+@echo off
+echo --------Renaming Folder------------
+@echo on
 rename boost_1_47_0 1.47.0
-rem ----------Installing---------------
+@echo off
+echo ----------Installing---------------
+@echo on
 cd %thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
 call bootstrap.bat
 @echo off
@@ -133,17 +163,23 @@ cd stage
 )
 @echo on
 cd C:\
-rem -----End Boost Installation--------
+@echo off
+echo -----End Boost Installation--------
 
-rem -----------------------------------
-rem -------VTK Installation------------
-rem -----------------------------------
-rem ----------Extracting---------------
-mkdir %thirdpartyGeneration%\thirdparty_source\VTK
+echo -----------------------------------
+echo -------VTK Installation------------
+echo -----------------------------------
+echo ----------Extracting---------------
+@echo on
+cd %thirdpartyGeneration%\thirdparty_source\
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\vtk-5.8.0.tar.gz
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\vtk-5.8.0.tar.gz
 cd %thirdpartyGeneration%\thirdparty_source\VTK
-%zipPath% x %thirdpartyGeneration%\thirdparty_source\vtk-5.6.1.zip
-del %thirdpartyGeneration%\thirdparty_source\vtk-5.6.1.zip
-rem ----------Installing---------------
+del %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar.gz
+del %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar.gz
+@echo off
+echo ----------Installing---------------
+@echo on
 cd  %binpath%
 mkdir %vtk%Bin
 cd %vtk%Bin
@@ -154,39 +190,47 @@ cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 cd c:\
-rem ------End VTK Installation---------
+@echo off
+echo ------End VTK Installation---------
 
-rem -----------------------------------
-rem -------GDCM Installation-----------
-rem -----------------------------------
-rem -------Setting Variables-----------
-rem ----------Extracting---------------
+echo -----------------------------------
+echo -------GDCM Installation-----------
+echo -----------------------------------
+echo -------Setting Variables-----------
+echo ----------Extracting---------------
+@echo on
 cd %thirdpartyGeneration%\thirdparty_source
-%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---------------
+%zipPath% x gdcm.tar.gz
+%zipPath% x gdcm.tar
+del gdcm.tar.gz
+del gdcm.tar
+@echo off
+echo ----------Installing---------------
+@echo on
 cd  %binpath%
 mkdir %gdcm%Bin
 cd %gdcm%Bin
-cmake -G"Visual Studio 10"  -H%sourcepath%\%gdcm% -B%binpath%\%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=%binpath%\%vtk%Bin -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
+cmake -D VTK_DIR:PATH=%binpath%\%vtk%Bin -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -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---------
+@echo off
+echo -----End GDCM Installation---------
 
-rem -----------------------------------
-rem -------ITK Installation------------
-rem -----------------------------------
-rem ----------Extracting---------------
+echo -----------------------------------
+echo -------ITK Installation------------
+echo -----------------------------------
+echo ----------Extracting---------------
+@echo on
 cd %thirdpartyGeneration%\thirdparty_source
 %zipPath% x InsightToolkit-3.20.0.zip
 del InsightToolkit-3.20.0.zip
-rem ----------Installing---------------
+@echo off
+echo ----------Installing---------------
+@echo on
 cd  %binpath%
 mkdir %itk%Bin
 cd %itk%Bin
@@ -197,20 +241,26 @@ cmake CMakeCache.txt
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 cd c:\
-rem ------End ITK Installation---------
+@echo off
+echo ------End ITK Installation---------
 
-rem -----------------------------------
-rem ------XERCES Installation----------
-rem -----------------------------------
-rem ----------Extracting---------------
+echo -----------------------------------
+echo ------XERCES Installation----------
+echo -----------------------------------
+echo ----------Extracting---------------
+@echo on
 cd %thirdpartyGeneration%\thirdparty_source
 %zipPath% x xerces-c-3.1.1.zip
 del xerces-c-3.1.1.zip
-rem ----------Installing---------------
+@echo off
+echo ----------Installing---------------
+@echo on
 cd  %sourcepath%\%xercesc%\projects\Win32\VC10\xerces-all
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=build
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 msbuild /p:Configuration=%buildType% INSTALL.vcxproj
-rem -----End XERCES Installation-------
+@echo off
+echo -----End XERCES Installation-------
+@echo on
 cd c:\
 pause