From 46fa7d8772214a9cf0a5ca8e208e400528e5e7c9 Mon Sep 17 00:00:00 2001 From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr> Date: Thu, 2 Aug 2012 16:38:46 +0000 Subject: [PATCH] Feature #1525 --- creaThirdParty Libraries (Debug version) DFCH -- creaThirdPartyLibrary is now working 100% in release and debug version. --- .../install_generate_thirdparty.bat_TEMPLATE | 2 +- .../scripts/install_thirdparty_all.bat | 2 +- .../scripts/install_thirdparty_dlls_cmake.bat | 5 +- .../install_thirdparty_libraries_cmake.bat | 4 +- .../scripts/move_thirdparty_dlls.bat | 20 ++-- .../scripts/move_thirdparty_libraries.bat | 92 +++++++++++-------- 6 files changed, 74 insertions(+), 51 deletions(-) diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE index 37756bb..c10e36d 100644 --- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE +++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE @@ -5,7 +5,7 @@ echo ---Setting Environment Variables--- echo ----------------------------------- set thirdpartyGeneration=<directory where you want to generate> -set buildType=<debug|release|RelWithDebInfo> +set buildType=<debug|release> ::The following line sets wxWidgets version. Set it ON if you want to compile wxWidgets 2.8.12 ::The following line set swxWidgets version. Set it OFF if you want to compile wxWidgets 2.9.3 diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat index 76d011b..0df459e 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_all.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat @@ -114,7 +114,7 @@ if %x86Comp%==ON ( if %PROCESSOR_ARCHITECTURE%==x86 ( nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1 USE_OPENGL=1 >> %LogFolder%\wxInstall.log 2>&1 ) else ( - nmake -f makefile.vc TARGET_CPU=AMD64 BUILD=release UNICODE=0 SHARED=1 USE_OPENGL=1 >> %LogFolder%\wxInstall.log 2>&1 + nmake -f makefile.vc TARGET_CPU=AMD64 BUILD=%buildType% UNICODE=0 SHARED=1 USE_OPENGL=1 >> %LogFolder%\wxInstall.log 2>&1 ) ) cd C:\ diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat index 4dcafb0..86c1451 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat @@ -29,7 +29,6 @@ set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall. set thirdpartydllspath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls set sourcepath=%thirdparty_cmake%\crea_ThirdParty_dlls set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\crea_ThirdParty_dlls_Bin -set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls" if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" if not exist %vcvarsall% ( @@ -39,15 +38,19 @@ if not exist %vcvarsall% ( if %x86Comp%==ON ( call %vcvarsall% + set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls" echo "Compilation forced x86" ) else ( if %PROCESSOR_ARCHITECTURE%==x86 ( call %vcvarsall% + set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls" ) else ( call %vcvarsall% amd64 + set installpath="%ProgramFiles%\creatools\crea_ThirdParty_dlls" ) ) +rmdir /S /Q %binpath% mkdir %binpath% cd %binpath% diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat index 2c4946d..6343600 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat +++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat @@ -28,7 +28,6 @@ set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall. set thirdpartylibpath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries set sourcepath=%thirdparty_cmake%\crea_ThirdParty_Libraries set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\creaTPLBin -set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries" if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" if not exist %vcvarsall% ( @@ -41,12 +40,15 @@ if %x86Comp%==ON ( echo "Compilation forced x86" ) else ( if %PROCESSOR_ARCHITECTURE%==x86 ( + set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_Libraries" call %vcvarsall% ) else ( + set installpath="%ProgramFiles%\creatools\crea_ThirdParty_Libraries" call %vcvarsall% amd64 ) ) +rmdir /S /Q %binpath% mkdir %binpath% cd %binpath% diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat index d538fce..6fd5b65 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat @@ -48,14 +48,13 @@ echo 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 - ) -::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 ( @@ -134,6 +133,9 @@ echo ----------------------------------- echo -------------Boost----------------- echo ----------------------------------- +set boostMT=-vc100-mt-1_49.dll +set boostMTGD=-vc100-mt-gd-1_49.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% @@ -168,7 +170,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------------------- diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat index d0bbd5f..b650bb4 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat @@ -56,16 +56,13 @@ echo if(%buildType%==release)( set qtBtype=4 set wxPrefixBase=wxbase28 set wxPrefixmsw=wxmsw28 - 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 + set xercesFile=xerces-c_3_1.dll + ) else ( + set qtBtype=d4 + set wxPrefixBase=wxbase28d + set wxPrefixmsw=wxmsw28d + set xercesFile=xerces-c_3_1D.dll ) -:: else ( -:: set qtBtype=d4 -:: set wxPrefixBase=wxbase293d -:: set wxPrefixmsw=wxmsw293d -:: ) if %x86Comp%==ON ( set vcFolder=vc_dll @@ -169,21 +166,28 @@ copy /V /Y %QTDIR%\bin\QtDesigner%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bi copy /V /Y %QTDIR%\bin\QtDesignerComponents%qtBtype%.dll %creaThirdPartyLibraries%\%qt%\bin\ ::XCOPY %QTDIR%\lib\*.lib %creaThirdPartyLibraries%\%qt%\lib\ /i DFCH -copy /V /Y %QTDIR%\lib\phonon4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QAxContainer.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QAxServer.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\Qt3Support4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtCore4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtGui4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\qtmain.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtNetwork4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtOpenGL4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtScript4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtSql4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtSvg4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtTest4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtXml4.lib %creaThirdPartyLibraries%\%qt%\lib\ -copy /V /Y %QTDIR%\lib\QtXmlPatterns4.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\phonon%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\Qt3Support%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtCore%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtGui%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtNetwork%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtOpenGL%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtScript%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtSql%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtSvg%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtTest%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtXml%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ +copy /V /Y %QTDIR%\lib\QtXmlPatterns%qtBtype%.lib %creaThirdPartyLibraries%\%qt%\lib\ + +IF %buildType%==release ( + copy /V /Y %QTDIR%\lib\QAxContainer.lib %creaThirdPartyLibraries%\%qt%\lib\ + copy /V /Y %QTDIR%\lib\QAxServer.lib %creaThirdPartyLibraries%\%qt%\lib\ + copy /V /Y %QTDIR%\lib\qtmain.lib %creaThirdPartyLibraries%\%qt%\lib\ +) ELSE ( + copy /V /Y %QTDIR%\lib\QAxContainerd.lib %creaThirdPartyLibraries%\%qt%\lib\ + copy /V /Y %QTDIR%\lib\QAxServerd.lib %creaThirdPartyLibraries%\%qt%\lib\ + copy /V /Y %QTDIR%\lib\qtmaind.lib %creaThirdPartyLibraries%\%qt%\lib\ +) mkdir %creaThirdPartyLibraries%\%qt%\src\corelib mkdir %creaThirdPartyLibraries%\%qt%\src\gui @@ -237,16 +241,26 @@ copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_media.lib %creaThirdPartyLibrari copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_xrc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% -copy /V /Y %WXDIR%\lib\%vcFolder%\wxexpat.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% -copy /V /Y %WXDIR%\lib\%vcFolder%\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% -copy /V /Y %WXDIR%\lib\%vcFolder%\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% -copy /V /Y %WXDIR%\lib\%vcFolder%\wxregex.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% -copy /V /Y %WXDIR%\lib\%vcFolder%\wxtiff.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% -copy /V /Y %WXDIR%\lib\%vcFolder%\wxzlib.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% - -mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\msw -XCOPY %WXDIR%\lib\%vcFolder%\msw\* %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\msw /s /i +IF %buildType%==release ( + copy /V /Y %WXDIR%\lib\%vcFolder%\wxexpat.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxregex.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxtiff.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxzlib.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\msw + XCOPY %WXDIR%\lib\%vcFolder%\msw\* %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\msw /s /i +) ELSE ( + copy /V /Y %WXDIR%\lib\%vcFolder%\wxexpatd.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxjpegd.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxpngd.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxregexd.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxtiffd.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + copy /V /Y %WXDIR%\lib\%vcFolder%\wxzlibd.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder% + mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\mswd + XCOPY %WXDIR%\lib\%vcFolder%\mswd\* %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\mswd /s /i +) mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\jpeg mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\png @@ -263,6 +277,11 @@ echo ----------------------------------- echo -------------Boost----------------- echo ----------------------------------- +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 + mkdir %creaThirdPartyLibraries%\%boost% mkdir %creaThirdPartyLibraries%\%boost%\include @@ -368,8 +387,7 @@ mkdir %creaThirdPartyLibraries%\%xercesc%\include\ mkdir %creaThirdPartyLibraries%\%xercesc%\lib\ XCOPY %XERCESDIR%\src\* %creaThirdPartyLibraries%\%xercesc%\include\ /s /i - -copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3.lib %creaThirdPartyLibraries%\%xercesc%\lib\ +copy /V /Y %XERCESDIR%\Build\%winType%\VC10\%buildType%\%xercesFile% %creaThirdPartyLibraries%\%xercesc%\lib\ echo ----------------------------------- echo -------------ITK------------------- @@ -390,16 +408,14 @@ mkdir %creaThirdPartyLibraries%\%vtk% mkdir %creaThirdPartyLibraries%\%vtk%\include mkdir %creaThirdPartyLibraries%\%vtk%\lib -::mkdir %creaThirdPartyLibraries%\%vtk%\bin XCOPY %VTKINSTALLDIR%\include\* %creaThirdPartyLibraries%\%vtk%\include /s /i XCOPY %VTKINSTALLDIR%\lib\* %creaThirdPartyLibraries%\%vtk%\lib /s /i -::XCOPY %VTKINSTALLDIR%\bin\* %creaThirdPartyLibraries%\%vtk%\bin /s /i echo cleaning del %creaThirdPartyLibraries%\%vtk%\lib\vtk-5.10\VTKTargets.cmake -del %creaThirdPartyLibraries%\%vtk%\lib\vtk-5.10\VTKTargets-release.cmake +::del %creaThirdPartyLibraries%\%vtk%\lib\vtk-5.10\VTKTargets-release.cmake echo ----------------------------------- echo -------------GDCM------------------ -- 2.49.0