X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_dlls.bat;h=5c6da0f1514602f17c6fde9f4a9092b58a934114;hb=4a364787d3f71bd8010767cd1b7ec3befda665f4;hp=5aea0bcd546b1df71f61eb3d0ff330043d7cd94d;hpb=e0ac25351b3a05358f33f18d1df155fd68f47de8;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index 5aea0bc..5c6da0f 100644
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -7,20 +7,23 @@ echo ---Setting Enviroment Variables----
 echo -----------------------------------
 
 set thirdpartyGeneration=%1
-set thirdpartyInstallPath=%2
+set buildType=%2
+
+set installpath=%thirdpartyGeneration%\thirdparty_install\%buildType%
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%
+set sourcepath=%thirdpartyGeneration%\thirdparty_source\%buildType%
 
-set installpath=%thirdpartyGeneration%\thirdparty_install
-set binpath=%thirdpartyGeneration%\thirdparty_bin
-set sourcepath=%thirdpartyGeneration%\thirdparty_source
 set creaThirdPartydlls=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls
 
-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 QTDIR=%sourcepath%\%qt%
 set WXDIR=%sourcepath%\%wxWidgets%
@@ -34,33 +37,69 @@ set ITKINSTALLDIR=%installpath%\%itk%
 set VTKINSTALLDIR=%installpath%\%vtk%
 set GDCMINSTALLDIR=%installpath%\%gdcm%
 
-rmdir %creaThirdPartydlls% /s /q
+rmdir /S /Q %creaThirdPartydlls%
 
 mkdir %creaThirdPartydlls%
 
+echo setting buildtype libraries
+echo if(%buildType%=="release")(
+	set qtBtype=4
+	set wxPrefixBase=wxbase293
+	set wxPrefixmsw=wxmsw293
+	set boostMT=-vc100-mt-1_49.dll
+	set boostMTGD=-vc100-mt-gd-1_49.dll
+echo ) else (
+echo	set qtBtype=d4
+echo	set wxPrefixBase=wxbase293d
+echo	set wxPrefixmsw=wxmsw293d
+echo )
+
+echo -----------------------------------
+echo Environment variables Configuration
+echo -----------------------------------
+echo ThirdpartyGeneration=%thirdpartyGeneration%
+echo MikTex=%miktex%
+echo miktexAux=%miktexAux%
+echo InstallPath=%installpath%
+echo BinPath=%binpath%
+echo SourcePath=%sourcepath%
+echo creaThirdPartyLibraries=%thirdpartyInstallPath%\creaThirdParty_libraries
+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 -----------------------------------
 echo -------------QT--------------------
 echo -----------------------------------
 
-copy /V /Y %QTDIR%\bin\phonon4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtCore4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtGui4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtNetwork4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtOpenGL4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtScript4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtScriptTools4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtSql4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtSvg4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtTest4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtXml4.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtXmlPatterns4.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\phonon%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtGui%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtNetwork%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtOpenGL%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtScript%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtScriptTools%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtSql%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtSvg%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtTest%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtXml%qtBtype%.dll %creaThirdPartydlls%
+copy /V /Y %QTDIR%\bin\QtXmlPatterns%qtBtype%.dll %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
 
-set wxPrefixBase=wxbase28
-set wxPrefixmsw=wxmsw28
 
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartydlls%
 copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_vc_custom.dll %creaThirdPartydlls%
@@ -80,9 +119,6 @@ echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
-set boostMT=-vc100-mt-1_46_1.dll
-set boostMTGD=-vc100-mt-gd-1_46_1.dll
-
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMT% %creaThirdPartydlls%
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMTGD% %creaThirdPartydlls%
 copy /V /Y %BOOSTINSTALLDIR%\lib\boost_filesystem%boostMT% %creaThirdPartydlls%