X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_libraries.bat;h=42dab7ddd4b85c6163106b18e20cf105468fab54;hb=4a364787d3f71bd8010767cd1b7ec3befda665f4;hp=0b0e4da0051f7aa18892c664d6bb7201b2ab620d;hpb=e0ac25351b3a05358f33f18d1df155fd68f47de8;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index 0b0e4da..42dab7d 100644
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -20,42 +20,62 @@ echo -----------------------------------
 set thirdpartyGeneration=%1
 set thirdpartyInstallPath=%2
 
-set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe"
-set installpath=%thirdpartyGeneration%\thirdparty_install
-set binpath=%thirdpartyGeneration%\thirdparty_bin
-set sourcepath=%thirdpartyGeneration%\thirdparty_source
+set MIKTEXPFDIR="%ProgramFilesPath_x86%\MiKTeX 2.9\miktex\bin\texworks.exe"
+
+set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
+set sourcepath=%thirdpartyGeneration%\thirdparty_source\%buildType%
+
 set creaThirdPartyLibraries=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries
 
-set qt=Qt-4.7.3
-set wxWidgets=wxWidgets-2.8.12
-set boost=Boost-1.46.1
-set xercesc=xerces-c-3.1.1
-set itk=InsightToolkit-3.20.0
+set qt=qt
+set jom=jom
+set wxWidgets=wxWidgets
+set boost=boost
+set xercesc=xerces
+set itk=itk
 set gdcm=gdcm
-set vtk=VTK
+set vtk=vtk
 set tth=tth
-set miktexAux=MiKTeX-2.9
+set miktex=miktex
+
 
 set QTDIR=%sourcepath%\%qt%
 set WXDIR=%sourcepath%\%wxWidgets%
 set BOOSTDIR=%sourcepath%\%boost%
 set XERCESDIR=%sourcepath%\%xercesc%
 set ITKSRCDIR=%sourcepath%\%itk%
-set VTKSRCDIR=%sourcepath%\%VTK%
+set VTKSRCDIR=%sourcepath%\%vtk%
 set GDCMSRCDIR=%sourcepath%\%gdcm%
 set BOOSTINSTALLDIR=%installpath%\%boost%
 set ITKINSTALLDIR=%installpath%\%itk%
 set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 set TTHDIR=%sourcepath%\%tth%
+set MIKTEXDIR=%creaThirdPartyLibraries%\%miktex%
 
-if not exist %miktex% (
- set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
- if not exist %miktex% (
+if not exist %MIKTEXPFDIR% (
+ set MIKTEXPFDIR="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
+ if not exist %MIKTEXPFDIR% (
   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 MIKTEXPFDIR="%ProgramFilesPath_x64%\MiKTeX 2.9"
+) else set MIKTEXPFDIR="%ProgramFilesPath_x86%\MiKTeX 2.9"
+
+
+echo if(%buildType%==release)(
+	set qtBtype=4
+	set wxPrefixBase=wxbase293
+	set wxPrefixmsw=wxmsw293
+	set boostMT=-vc100-mt-1_49.lib
+	set boostMTGD=-vc100-mt-gd-1_49.lib
+	set boostMTS=-vc100-mt-s-1_49.lib
+	set boostMTSGD=-vc100-mt-sgd-1_49.lib
+echo ) else (
+echo	set qtBtype=d4
+echo 	set wxPrefixBase=wxbase293d
+echo	set wxPrefixmsw=wxmsw293d
+echo )
 
 echo -----------------------------------
 echo Environment variables Configuration
@@ -81,10 +101,11 @@ echo XERCESDIR=%XERCESDIR%
 echo ITKSRCDIR=%ITKSRCDIR%
 echo VTKSRCDIR=%VTKSRCDIR%
 
-rmdir %creaThirdPartyLibraries% /s /q
+rmdir /S /Q %creaThirdPartyLibraries%
 
 mkdir %creaThirdPartyLibraries%
 
+
 echo -----------------------------------
 echo -------------QT--------------------
 echo -----------------------------------
@@ -120,10 +141,10 @@ copy /V /Y %QTDIR%\bin\rcc.exe %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\uic.exe %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\uic3.exe %creaThirdPartyLibraries%\%qt%\bin\
 copy /V /Y %QTDIR%\bin\xmlpatterns.exe %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\Qt3Support4.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtCore4.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtDesigner4.dll %creaThirdPartyLibraries%\%qt%\bin\
-copy /V /Y %QTDIR%\bin\QtDesignerComponents4.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\Qt3Support%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
+copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\
 
 XCOPY %QTDIR%\lib\*.lib %creaThirdPartyLibraries%\%qt%\lib\ /i
 
@@ -140,8 +161,6 @@ echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
 
-set wxPrefixBase=wxbase28
-set wxPrefixmsw=wxmsw28
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%
 
@@ -196,11 +215,6 @@ echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
-set boostMT=-vc100-mt-1_46_1.lib
-set boostMTGD=-vc100-mt-gd-1_46_1.lib
-set boostMTS=-vc100-mt-s-1_46_1.lib
-set boostMTSGD=-vc100-mt-sgd-1_46_1.lib
-
 mkdir %creaThirdPartyLibraries%\%boost%
 
 mkdir %creaThirdPartyLibraries%\%boost%\include
@@ -358,7 +372,8 @@ echo -------------MiKText---------------
 echo -----------------------------------
 mkdir %creaThirdPartyLibraries%\%miktexAux%
 
-XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i
+XCOPY %MIKTEXPFDIR%\* %MIKTEXDIR% /s /i
+
 
 echo -----------------------------------
 echo -----End of Moving Libraries-------