From 03607b42d8b06f9664d601c4d97b124dd6562d62 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Sat, 17 Dec 2011 23:02:47 +0000 Subject: [PATCH] DFCH: Script changes --- Install_ThirdParty/scripts/install_thirdparty_all.bat | 11 +++++------ .../scripts/move_thirdparty_libraries.bat | 10 ++-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat index f84f1e4..2773812 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -112,7 +112,7 @@ echo ----------------------------------- call %vcvarsall% -goto next + echo ----------------------------------- echo -------Creating Folders------------ echo ----------------------------------- @@ -132,7 +132,7 @@ echo ------End Creating Folders--------- echo ----------------------------------- echo ------Downloading Sources---------- echo ----------------------------------- -:next + cd %thirdpartyGeneration%\thirdparty_source\ %wgetPath% %urlCreatisSource%/qt-4.7.3.zip IF %buildWxWidgets28%==0 ( @@ -140,7 +140,6 @@ IF %buildWxWidgets28%==0 ( ) ELSE ( %wgetPath% %urlCreatisSource%/wxWidgets-2.8.12.tar.gz ) -goto next %wgetPath% %urlCreatisSource%/boost_1_46_1.7z %wgetPath% %urlCreatisSource%/vtk-5.8.0.tar.gz %wgetPath% %urlCreatisSource%/InsightToolkit-3.20.0.zip @@ -177,7 +176,7 @@ echo ----------------------------------- echo -----wxWidgets Installation-------- echo ----------------------------------- echo ----------Extracting--------------- -:next + cd %sourcepath% IF %buildWxWidgets28%==0 ( md %wxWidgets% @@ -201,7 +200,7 @@ IF %buildWxWidgets28%==0 ( cd C:\ echo ----End wxWidgets Installation----- -goto next + echo ----------------------------------- echo ------Boost Installation----------- echo ----------------------------------- @@ -340,5 +339,5 @@ cd c:\ echo ----------------------------------- echo ---End of Installing Libraries----- echo ----------------------------------- -:next + exit /B \ No newline at end of file diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat index 5f9ace1..0b0e4da 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat @@ -54,14 +54,8 @@ if not exist %miktex% ( if not exist %miktex% ( echo ERROR!!! MiKTex has not been found in the system exit - ) - else ( - set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9" - ) -) -else ( -set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9" -) + ) else set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9" +) else set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9" echo ----------------------------------- echo Environment variables Configuration -- 2.45.0