X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fdownload_ThirdPartySW.bat;h=71300460eb2b37935a31224a3d31e4a3ab5fd554;hb=67a0a4de0e7d0b76e4bd6e1727da7802bb77fcf7;hp=7c96b27e3c4c084e17b90c4ab5e091677bf6b9b4;hpb=ccb1ae950682ee155ec30689715c36734f1839f4;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index 7c96b27..7130046 100644
--- a/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -9,9 +9,9 @@ echo -----------------------------------
 
 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/~caceres/software
 
 if %PROCESSOR_ARCHITECTURE%==x86 (
   set ProgramFilesPath_x86=%ProgramFiles%
@@ -56,12 +56,21 @@ set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
 set sourcepath=%thirdpartyGeneration%\thirdparty_source\%buildType%
 
 set QTFNAME=qt-everywhere-opensource-src-4.8.2.zip
-set WXFNAME=wxWidgets-2.9.3.7z
+
+if %wxStable%==ON (
+	set WXFNAME=wxWidgets-2.8.12.zip
+	set WXVERSION=2.8.12
+) else (
+	set WXFNAME=wxWidgets-2.9.3.zip
+	set WXVERSION=2.9.2
+)
+else
 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_11_Oct_2011.tar.gz
+set GDCMFNAME=gdcm_05_Mai_2011.tar
 set TTHFNAME=tth_exe.zip
 set JOMFNAME=jom.zip
 
@@ -102,12 +111,12 @@ echo -----------------------------------
 cd %sourcepath%\
 
 %wgetPath% "http://releases.qt-project.org/qt4/source/%QTFNAME%"
-%wgetPath% "http://sourceforge.net/projects/wxwindows/files/2.9.3/%WXFNAME%/download"
+%wgetPath% "http://sourceforge.net/projects/wxwindows/files/%WXVERSION%/%WXFNAME%/download"
 %wgetPath% "http://sourceforge.net/projects/boost/files/boost/1.49.0/%BOOSTFNAME%/download"
 %wgetPath% "http://mirror.ibcp.fr/pub/apache//xerces/c/3/sources/%XERCESFNAME%"
 %wgetPath% "http://sourceforge.net/projects/itk/files/itk/3.20/%ITKFNAME%/download"
 %wgetPath% "http://www.vtk.org/files/release/5.10/%VTKFNAME%"
-%wgetPath% "%urlCreatisSource%/%GDCMFNAME%"
+%wgetPath% "%urlCreatisSource%/%GDCMFNAME%.gz"
 %wgetPath% "http://hutchinson.belmont.ma.us/tth/tth-noncom/%TTHFNAME%"
 %wgetPath% "ftp://ftp.qt.nokia.com/jom/%JOMFNAME%"
 
@@ -134,7 +143,7 @@ echo -----------------------------------
 echo ----------Extracting---------------
 
 cd %sourcepath%
-%zipPath% x %sourcepath%\%WXFNAME% -o*
+%zipPath% x %sourcepath%\%WXFNAME%
   del %sourcepath%\%WXFNAME%
 
 echo -----------------------------------
@@ -174,10 +183,10 @@ echo ------------GDCM ------------------
 echo -----------------------------------
 
 cd %sourcepath%
-%zipPath% x gdcm_11_Oct_2011.tar.gz
-%zipPath% x gdcm_11_Oct_2011.tar
-del gdcm_11_Oct_2011.tar.gz
-del gdcm_11_Oct_2011.tar
+%zipPath% x %GDCMFNAME%.gz
+%zipPath% x %GDCMFNAME%
+del %GDCMFNAME%.gz
+del %GDCMFNAME%
 
 echo -----------------------------------
 echo --------------TTH------------------
@@ -196,7 +205,7 @@ echo --------Renaming Folders-----------
 echo -----------------------------------
 cd %sourcepath%
 rename qt-everywhere-opensource-src-4.8.2 qt
-rename wxWidgets-2.9.3 wxWidgets
+rename wxWidgets-%WXVERSION% wxWidgets
 rename boost_1_49_0 boost
 rename InsightToolkit-3.20.1 itk
 rename VTK vtk