X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_dlls.bat;h=0b3c0f34dc7f7ff9521a77f16550a6db5673e19f;hb=d2694504db1df749aaf7647fb5ddc69c5dbe0c52;hp=b41c358917af198b8a86d25e2b0e5ee2ec46659a;hpb=14730504d810d9c3004c636760cb3923f9c7d11b;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index b41c358..0b3c0f3 100644
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -23,7 +23,7 @@ set wxWidgets=wxWidgets
 set boost=boost
 set xercesc=xerces
 set itk=itk
-set gdcm=gdcm
+set gdcm=gdcm13
 set vtk=vtk
 set tth=tth
 
@@ -44,17 +44,17 @@ rmdir /S /Q %creaThirdPartydlls%
 mkdir %creaThirdPartydlls%
 
 echo setting buildtype libraries
-echo if(%buildType%=="release")(
+if %buildType%==release (
 	set qtBtype=4
 	set wxPrefixBase=wxbase28
 	set wxPrefixmsw=wxmsw28
-	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 )
+	set xercesFile=xerces-c_3_1.dll
+) else (
+	set qtBtype=d4
+	set wxPrefixBase=wxbase28d
+	set wxPrefixmsw=wxmsw28d
+	set xercesFile=xerces-c_3_1D.dll
+)
 
 
 if %x86Comp%==ON (
@@ -73,14 +73,14 @@ if %x86Comp%==ON (
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
+echo buildType=%buildType%
 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 qtBtype=%qtBtype%
 echo WX=%wxWidgets%
 echo BOOST=%boost%
 echo Xercesc=%xercesc%
@@ -112,33 +112,6 @@ 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%
 
-:: In order to compile I have to copy the following dlls -- change it because those libraries should be in dll folder of thirdparty libs
-copy /V /Y %QTDIR%\bin\assistant.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\designer.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\dumpcpp.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\idc.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\lconvert.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\linguist.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\lrelease.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\lupdate.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\moc.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\pixeltool.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qcollectiongenerator.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qhelpconverter.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qhelpgenerator.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qmake.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qt3to4.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\qtdemo.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\rcc.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\uic.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\uic3.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\xmlpatterns.exe %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\Qt3Support%qtBtype%.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtCore%qtBtype%.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartydlls%
-copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartydlls%
-::End of temporal copy
-
 echo -----------------------------------
 echo -------------wxWidgets-------------
 echo -----------------------------------
@@ -162,6 +135,11 @@ echo -----------------------------------
 echo -------------Boost-----------------
 echo -----------------------------------
 
+REM set boostMT=-vc100-mt-1_49.dll
+REM set boostMTGD=-vc100-mt-gd-1_49.dll
+set boostMT=-vc100-mt-1_52.dll
+set boostMTGD=-vc100-mt-gd-1_52.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%
@@ -196,7 +174,7 @@ echo -----------------------------------
 echo -------------Xcerces---------------
 echo -----------------------------------
 
-copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3_1.dll %creaThirdPartydlls%
+copy /V /Y %XERCESDIR%\Build\%winType%\VC10\%buildType%\%xercesFile% %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------ITK-------------------