DFCH: Changes in the batch script (Changes in folder names) - Inestable

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 183cc458bc1cb6c4cef84a7f1e93a582066c923a..c7f15b607780160db4900afad033185cc2dfdc7a 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -32,14 +32,21 @@ set installpath=%thirdpartyGeneration%\thirdparty_install
 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 xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
 set vtk=VTK
 
-set QTDIR=%thirdpartyGeneration%\thirdparty_source\Qt\4.7.3\
-set WXDIR=%thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\
-set BOOSTDIR=%thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
+set QTDIR=%sourcepath%\%qt%
+set WXDIR=%sourcepath%\%wxWidgets%
+set BOOSTDIR=%sourcepath%\%boost%
+set XERCESDIR=%sourcepath%\%xercesc%
+set ITKSRCDIR=%sourcepath%\%itk%
+set VTKSRCDIR=%sourcepath%\%VTK%
+set GDCMSRCDIR=%sourcepath%\%gdcm%
 
 
 @echo off
@@ -88,19 +95,17 @@ echo --------Qt Installation------------
 echo -----------------------------------
 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
+cd %sourcepath%
+%zipPath% x %sourcepath%\qt-4.7.3.zip
+del %sourcepath%\qt-4.7.3.zip
 @echo off
 echo --------Renaming Folder------------
 @echo on
-rename qt-everywhere-opensource-src-4.7.3 4.7.3
+rename qt-everywhere-opensource-src-4.7.3 %qt%
 @echo off
 echo ----------Installing---------------
 @echo on
-cd 4.7.3
+cd %qt%
 echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
 nmake
 cd C:\
@@ -112,15 +117,15 @@ echo -----wxWidgets Installation--------
 echo -----------------------------------
 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
+cd %sourcepath%
+md %wxWidgets%
+cd %wxWidgets%
+%zipPath% x %sourcepath%\wxWidgets-2.9.2.7z
+del %sourcepath%\wxWidgets-2.9.2.7z
 @echo off
 echo ----------Installing---------------
 @echo on
-cd %thirdpartyGeneration%\thirdparty_source\wxWidgets\2.9.2\build\msw
+cd %sourcepath%\%wxWidgets%\build\msw
 nmake -f makefile.vc BUILD=%buildType% UNICODE=1 SHARED=1
 cd C:\
 @echo off
@@ -131,19 +136,17 @@ echo ------Boost Installation-----------
 echo -----------------------------------
 echo ----------Extracting---------------
 @echo on
-cd %thirdpartyGeneration%\thirdparty_source\
-md Boost\
-cd Boost\
+cd %sourcepath%
 %zipPath% x %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
 del %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
 @echo off
 echo --------Renaming Folder------------
 @echo on
-rename boost_1_47_0 1.47.0
+rename boost_1_47_0 %boost%
 @echo off
 echo ----------Installing---------------
 @echo on
-cd %thirdpartyGeneration%\thirdparty_source\Boost\1.47.0\
+cd %sourcepath%\%boost%
 call bootstrap.bat
 @echo off
 if %PROCESSOR_ARCHITECTURE%==x86 (
@@ -166,7 +169,7 @@ echo -------ITK Installation------------
 echo -----------------------------------
 echo ----------Extracting---------------
 @echo on
-cd %thirdpartyGeneration%\thirdparty_source
+cd %sourcepath%
 %zipPath% x InsightToolkit-3.20.0.zip
 del InsightToolkit-3.20.0.zip
 @echo off
@@ -190,7 +193,7 @@ echo ------XERCES Installation----------
 echo -----------------------------------
 echo ----------Extracting---------------
 @echo on
-cd %thirdpartyGeneration%\thirdparty_source
+cd %sourcepath%
 %zipPath% x xerces-c-3.1.1.zip
 del xerces-c-3.1.1.zip
 @echo off
@@ -210,7 +213,7 @@ echo -------VTK Installation------------
 echo -----------------------------------
 echo ----------Extracting---------------
 @echo on
-cd %thirdpartyGeneration%\thirdparty_source\
+cd %sourcepath%
 %zipPath% x %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar.gz
 %zipPath% x %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar
 cd %thirdpartyGeneration%\thirdparty_source\VTK
@@ -237,7 +240,7 @@ echo -------GDCM Installation-----------
 echo -----------------------------------
 echo ----------Extracting---------------
 @echo on
-cd %thirdpartyGeneration%\thirdparty_source
+cd %sourcepath%
 %zipPath% x gdcm_11_Oct_2011.tar.gz
 %zipPath% x gdcm_11_Oct_2011.tar
 del gdcm_11_Oct_2011.tar.gz