DFCH: Some bugs Solved!!

[creaToolsTools.git] / Install_ThirdParty / scripts / install_thirdparty_all.bat

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index a0d1bdde94da58aa12436e2e923a6a3170ab9658..2217d22c95e22827f145f85876803d4fc76ba04f 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -1,5 +1,8 @@
 @echo off
 echo -----------------------------------
+echo ------Installing Libraries---------
+echo -----------------------------------
+echo -----------------------------------
 echo ------Asking Architecture----------
 echo -----------------------------------
 if %PROCESSOR_ARCHITECTURE%==x86 (
@@ -14,7 +17,7 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 echo ----End Asking Architecture--------
 
 echo -----------------------------------
-echo ---Setting Environment Variables----
+echo ---Setting Environment Variables---
 echo -----------------------------------
 
 set thirdpartyGeneration=%1
@@ -38,11 +41,15 @@ if not exist %vcvarsall% (
   echo ERROR!!! Visual Studio has not been found in the system
   exit
 )
-if not exist %miktex% set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
+
 if not exist %miktex% (
+ set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
+ if not exist %miktex% (
   echo ERROR!!! MiKTex has not been found in the system
   exit
+ )
 )
+
 if not exist %wgetPath% (
   echo ERROR!!! wget has not been found in the system
   exit
@@ -81,7 +88,7 @@ echo 7zip=%zipPath%
 echo Visual Studio=%vcvarsall%
 echo InstallPath=%installpath%
 echo BinPath=%binpath%
-echo SourcePath%sourcepath%
+echo SourcePath=%sourcepath%
 echo QT=%qt%
 echo WX=%wxWidgets%
 echo BOOST=%boost%
@@ -97,6 +104,7 @@ echo ITKSRCDIR=%ITKSRCDIR%
 echo VTKSRCDIR=%VTKSRCDIR%
 echo GDCMDIR=%GDCMSRCDIR%
 
+echo -----------------------------------
 echo ---End Setting Global Variables----
 echo -----------------------------------
 
@@ -151,12 +159,7 @@ echo ----------Installing---------------
 
 cd %QTDIR%
 
-
-if %PROCESSOR_ARCHITECTURE%==x86 (
-echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
-) else (
 echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
-)
 
 nmake
 cd C:\
@@ -199,18 +202,7 @@ echo ----------Installing---------------
 
 cd %sourcepath%\%boost%
 call bootstrap.bat
-
-if %PROCESSOR_ARCHITECTURE%==x86 (
-
-  b2.exe --toolset=msvc-10.0 --build-type=complete stage
-
-) else (
-
-cd stage
-  b2.exe --toolset=msvc-10.0 --build-type=complete architecture=x86 address-model=64 stage
-
-)
-
+b2.exe --toolset=msvc-10.0 --build-type=complete stage
 cd C:\
 
 echo -----End Boost Installation--------
@@ -322,4 +314,8 @@ rename tth_exe tth
 del tth_exe.zip
 echo ------End TTH Installation---------
 cd c:\
-@echo on
\ No newline at end of file
+echo -----------------------------------
+echo ---End of Installing Libraries-----
+echo -----------------------------------
+
+exit /B
\ No newline at end of file