DFCH: Feature #1524

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

diff --git a/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index 71300460eb2b37935a31224a3d31e4a3ab5fd554..b4a5842d94821a12452bc327d601b0570fea59a7 100644 (file)
--- a/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -11,7 +11,8 @@ set thirdpartyGeneration=%1
 set buildType=%2
 set wxStable=%3
 
-set urlCreatisSource=http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source
+:: set urlCreatisSource=http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source
+set urlCreatisSource=http://www.creatis.insa-lyon.fr/~caceres/software
 
 if %PROCESSOR_ARCHITECTURE%==x86 (
   set ProgramFilesPath_x86=%ProgramFiles%
@@ -23,7 +24,6 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 )
 
 set zipPath="%ProgramFilesPath_x86%\7-Zip\7z.exe"
-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="%ProgramFilesPath_x86%\GnuWin32\bin\wget.exe"
 
@@ -38,14 +38,6 @@ if not exist %vcvarsall% (
   exit
 )
 
-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
@@ -54,6 +46,7 @@ if not exist %wgetPath% (
 set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
 set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
 set sourcepath=%thirdpartyGeneration%\thirdparty_source\%buildType%
+set LogFolder=%thirdpartyGeneration%\installLog
 
 set QTFNAME=qt-everywhere-opensource-src-4.8.2.zip
 
@@ -69,8 +62,8 @@ set BOOSTFNAME=boost_1_49_0.7z
 set XERCESFNAME=xerces-c-3.1.1.zip
 set ITKFNAME=InsightToolkit-3.20.1.zip
 set VTKFNAME=vtk-5.10.0.zip
-::set GDCMFNAME=gdcm_11_Oct_2011.tar.gz
-set GDCMFNAME=gdcm_05_Mai_2011.tar
+set GDCMFNAME=gdcm_11_Oct_2011.tar
+::set GDCMFNAME=gdcm_05_Mai_2011.tar
 set TTHFNAME=tth_exe.zip
 set JOMFNAME=jom.zip
 
@@ -80,7 +73,6 @@ echo -----------------------------------
 echo ThirdpartyGeneration=%thirdpartyGeneration%
 echo BuildType=%buildType%
 echo wget=%wgetPath%
-echo MikTex=%miktex%
 echo urlCreatis=%urlCreatisSource%
 echo 7zip=%zipPath%
 echo Visual Studio=%vcvarsall%
@@ -88,22 +80,6 @@ echo InstallPath=%installpath%
 echo BinPath=%binpath%
 echo SourcePath=%sourcepath%
 
-echo -----------------------------------
-echo -------Removing Folders------------
-echo -----------------------------------
-
-rmdir /S /Q %thirdpartyGeneration%
-
-echo -----------------------------------
-echo -------Creating Folders------------
-echo -----------------------------------
-
-mkdir %thirdpartyGeneration%
-cd  %thirdpartyGeneration%
-mkdir %sourcepath%
-mkdir %binpath%
-mkdir %installpath%
-
 echo -----------------------------------
 echo ------Downloading Sources----------
 echo -----------------------------------
@@ -162,6 +138,16 @@ cd %sourcepath%
 %zipPath% x %sourcepath%\%VTKFNAME%
 del %sourcepath%\%VTKFNAME%
 
+echo -----------------------------------
+echo ------------GDCM ------------------
+echo -----------------------------------
+
+cd %sourcepath%
+%zipPath% x %GDCMFNAME%.gz
+%zipPath% x %GDCMFNAME%
+del %GDCMFNAME%.gz
+del %GDCMFNAME%
+
 echo -----------------------------------
 echo -------------ITK-------------------
 echo -----------------------------------
@@ -178,16 +164,6 @@ cd %sourcepath%
 %zipPath% x %XERCESFNAME%
 del %XERCESFNAME%
 
-echo -----------------------------------
-echo ------------GDCM ------------------
-echo -----------------------------------
-
-cd %sourcepath%
-%zipPath% x %GDCMFNAME%.gz
-%zipPath% x %GDCMFNAME%
-del %GDCMFNAME%.gz
-del %GDCMFNAME%
-
 echo -----------------------------------
 echo --------------TTH------------------
 echo -----------------------------------
@@ -209,11 +185,12 @@ rename wxWidgets-%WXVERSION% wxWidgets
 rename boost_1_49_0 boost
 rename InsightToolkit-3.20.1 itk
 rename VTK vtk
-rename gdcm gdcm
+rename gdcm gdcm13
 rename tth_exe tth
 rename xerces-c-3.1.1 xerces
 
 echo -----End of Download Libraries-----
 echo -----------------------------------
+echo -----------------------------------
 
 exit /B
\ No newline at end of file