From e0ac25351b3a05358f33f18d1df155fd68f47de8 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Wed, 6 Jun 2012 13:40:14 +0000 Subject: [PATCH] Change in script --- .../scripts/install_thirdparty_all.bat | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat index 2773812..5a6a2bb 100644 --- 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--------------- -- 2.45.1