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 1d942818c2c8bf7856d876931077e466a9da5f0b..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
@@ -24,7 +27,7 @@ set urlCreatisSource=http://www.creatis.insa-lyon.fr/software/public/creatools/c
 set urlCreatisSource=http://www.creatis.insa-lyon.fr/~caceres/software
 
 set zipPath="%ProgramFilesPath_x86%\7-Zip\7z.exe"
-set "miktex=%ProgramFiles(x86)%\MiKTeX 2.9"
+set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe"
 set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 set wgetPath=%cd%\..\..\windows\creaTools_win_installers\CreaTools_v2_0_0_win32_installer\bin\wget.exe
 
@@ -38,11 +41,15 @@ if not exist %vcvarsall% (
   echo ERROR!!! Visual Studio has not been found in the system
   exit
 )
-if "%miktex%"=="\MiKTeX 2.9" set "miktex=%ProgramFiles%\MiKTeX 2.9"
-if "%miktex%"=="\MiKTeX 2.9" (
+
+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
@@ -72,30 +79,32 @@ set GDCMSRCDIR=%sourcepath%\%gdcm%
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
-echo %thirdpartyGeneration%
-echo %buildType%
-echo %wgetPath%
-echo %urlCreatisSource%
-echo %zipPath%
-echo %vcvarsall%
-echo %installpath%
-echo %binpath%
-echo %sourcepath%
-echo %qt%
-echo %wxWidgets%
-echo %boost%
-echo %xercesc%
-echo %itk%
-echo %gdcm%
-echo %vtk%
-echo %QTDIR%
-echo %WXDIR%
-echo %BOOSTDIR%
-echo %XERCESDIR%
-echo %ITKSRCDIR%
-echo %VTKSRCDIR%
-echo %GDCMSRCDIR%
+echo ThirdpartyGeneration=%thirdpartyGeneration%
+echo BuildType=%buildType%
+echo wget=%wgetPath%
+echo MikTex=%miktex%
+echo urlCreatis=%urlCreatisSource%
+echo 7zip=%zipPath%
+echo Visual Studio=%vcvarsall%
+echo InstallPath=%installpath%
+echo BinPath=%binpath%
+echo SourcePath=%sourcepath%
+echo QT=%qt%
+echo WX=%wxWidgets%
+echo BOOST=%boost%
+echo Xercesc=%xercesc%
+echo ITK=%itk%
+echo GDCM=%gdcm%
+echo VTK=%vtk%
+echo QTDIR=%QTDIR%
+echo WKDIR=%WXDIR%
+echo BOOSTDIR=%BOOSTDIR%
+echo XERCESDIR=%XERCESDIR%
+echo ITKSRCDIR=%ITKSRCDIR%
+echo VTKSRCDIR=%VTKSRCDIR%
+echo GDCMDIR=%GDCMSRCDIR%
 
+echo -----------------------------------
 echo ---End Setting Global Variables----
 echo -----------------------------------
 
@@ -105,8 +114,6 @@ echo -----------------------------------
 echo -------Creating Folders------------
 echo -----------------------------------
 
-
-
 rmdir %binpath% /s /q
 
 rmdir %thirdpartyGeneration% /s /q
@@ -152,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:\
@@ -200,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--------
@@ -323,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