Change in script

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 2773812540bd5b462a378661db408a754b5adab2..5a6a2bb6a22080d5a4b747b364965a62cc4b7212 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -56,9 +56,9 @@ if not exist %wgetPath% (
 )
 
 
-set installpath=%thirdpartyGeneration%\thirdparty_install
-set binpath=%thirdpartyGeneration%\thirdparty_bin
-set sourcepath=%thirdpartyGeneration%\thirdparty_source
+set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
+set sourcepath=%thirdpartyGeneration%\thirdparty_source\%buildType%
 
 set qt=Qt-4.7.3
 set buildWxWidgets28=1
@@ -117,14 +117,12 @@ echo -----------------------------------
 echo -------Creating Folders------------
 echo -----------------------------------
 
-rmdir %binpath% /s /q
-
-rmdir %thirdpartyGeneration% /s /q
+rmdir /S /Q %thirdpartyGeneration%
 mkdir %thirdpartyGeneration%
 cd  %thirdpartyGeneration%
-mkdir thirdparty_source
-mkdir thirdparty_bin
-mkdir thirdparty_install
+mkdir %sourcepath%
+mkdir %binpath%
+mkdir %installpath%
 
 
 echo ------End Creating Folders---------
@@ -133,7 +131,7 @@ echo -----------------------------------
 echo ------Downloading Sources----------
 echo -----------------------------------
 
-cd %thirdpartyGeneration%\thirdparty_source\
+cd %sourcepath%\
 %wgetPath% %urlCreatisSource%/qt-4.7.3.zip
 IF %buildWxWidgets28%==0 (
   %wgetPath% %urlCreatisSource%/wxWidgets-2.9.2.7z
@@ -207,8 +205,8 @@ echo -----------------------------------
 echo ----------Extracting---------------
 
 cd %sourcepath%
-%zipPath% x %thirdpartyGeneration%\thirdparty_source\boost_1_46_1.7z
-del %thirdpartyGeneration%\thirdparty_source\boost_1_46_1.7z
+%zipPath% x %sourcepath%\boost_1_46_1.7z
+del %sourcepath%\boost_1_46_1.7z
 
 echo --------Renaming Folder------------
 
@@ -233,11 +231,11 @@ echo -----------------------------------
 echo ----------Extracting---------------
 
 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
-del %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar.gz
-del %thirdpartyGeneration%\thirdparty_source\VTK-5.8.0.tar
+%zipPath% x %sourcepath%\VTK-5.8.0.tar.gz
+%zipPath% x %sourcepath%\VTK-5.8.0.tar
+cd %sourcepath%\VTK
+del %sourcepath%\VTK-5.8.0.tar.gz
+del %sourcepath%\VTK-5.8.0.tar
 
 echo ----------Installing---------------