From: guigues Date: Thu, 15 Jan 2009 14:22:02 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~95 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a986f3f7a9ac41009023c96c44275221c0efbb4f;p=creaToolsTools.git *** empty log message *** --- diff --git a/windows/CREATOOLS_PACKAGING_INSTRUCTIONS.txt b/windows/CREATOOLS_PACKAGING_INSTRUCTIONS.txt index ee89ddd..f896995 100644 --- a/windows/CREATOOLS_PACKAGING_INSTRUCTIONS.txt +++ b/windows/CREATOOLS_PACKAGING_INSTRUCTIONS.txt @@ -28,7 +28,7 @@ Create crea_ThirdParty_Libraries-2.0.0.rar * wxWidgets (wxMSW-2.8.9-Setup.exe) 2) -* Build and PACKAGE itk with options: +* Build and PACKAGE itk in 'RelWithDebInfo' configuration with options: (i.e. build the ALL_BUILD and PACKAGE projects) BUILD_EXAMPLES OFF BUILD_SHARED_LIBS ON @@ -38,7 +38,7 @@ BUILD_TESTING OFF * Execute it 3) -* Build and PACKAGE vtk with options: +* Build and PACKAGE vtk in 'RelWithDebInfo' configuration with options: (i.e. build the ALL_BUILD and PACKAGE projects) BUILD_EXAMPLES OFF BUILD_SHARED_LIBS ON @@ -49,27 +49,28 @@ VTK_WRAP_TCL ON * Execute it 4) -* Build and **INSTALL** kwwidgets with options: +* Build and **INSTALL** kwwidgets in 'RelWithDebInfo' configuration with options: (i.e. build the ALL_BUILD and INSTALL projects) CMAKE_INSTALL_PREFIX ROOT/crea_ThirdParty_Libraries-2.0.0/KWWidgets-090109 VTK_DIR the/install/dir/of/the/vtk/just/built/and/installed 5) -* Build wxWidgets in 'DLL Debug' configuration: +* Build wxWidgets in 'DLL Debug' and 'DLL Release' configuration: * Execute the sources installer (install in ROOT/crea_ThirdParty_Libraries-2.0.0/) * Open the project ROOT/crea_ThirdParty_Libraries-2.0.0/wxWidgets-X.X.X/build/msw/wx_dll/dsw * Set configuration to 'DLL Debug' -* Build all +* Build all. +Note : don't care about dbgrid link failure: From wx install instructions: - 'Pleae notice that it's normal that dbgrid project + 'Please notice that it's normal that dbgrid project doesn't build if wxUSE_ODBC is set to 0 (default).' * in ROOT/crea_ThirdParty_Libraries-2.0.0/wxWidgets-X.X.X : * Delete all folders except 'include' and 'lib' * Delete all files except 'wx-config.in' 6) -* Build and **INSTALL** gdcm with options +* Build and **INSTALL** gdcm in 'RelWithDebInfo' configuration with options CMAKE_INSTALL_PREFIX ROOT/crea_ThirdParty_Libraries-2.0.0/gdcm-090109 BUILD_EXAMPLES OFF BUILD_EXAMPLES OFF @@ -79,10 +80,11 @@ GDCM_VTK ON 7) * Update the README.txt ! * Create the archive ROOT/crea_ThirdParty_Libraries-2.0.0.rar -* copy it to tux in / +* copy it to tux in /var/www/html/software/creatools/crea_ThirdParty/v2_0 -8) +8) * Create crea_ThirdParty_dlls-2.0.0 installer * checkout crea_ThirdParty_dlls from creatis cvs +* copy it to tux in /var/www/html/software/creatools/crea_ThirdParty/v2_0 diff --git a/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/Install.bat b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/Install.bat new file mode 100644 index 0000000..324808b --- /dev/null +++ b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/Install.bat @@ -0,0 +1,4 @@ +echo off +cd bin +batch01.bat +cd .. \ No newline at end of file diff --git a/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/PostInstall.bat b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/PostInstall.bat new file mode 100644 index 0000000..a21696c --- /dev/null +++ b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/PostInstall.bat @@ -0,0 +1,15 @@ +echo off +echo PLUGGING-IN bbtk PACKAGE creaImageIO... +bbPlugPackage "%ProgramFiles%\CreaTools\creaImageIO-0.2.1" + +rem echo PLUGGING-IN bbtk PACKAGE creaMaracasVisu... +rem bbPlugPackage "%ProgramFiles%\CreaTools\creaMaracasVisu-1.0.0" +rem echo PLUGGING-IN bbtk PACKAGE creaContours... +rem bbPlugPackage "%ProgramFiles%\CreaTools\creaContours-1.2.0" + +echo REGENERATING bbtk PACKAGES DOCUMENTATIONS... +bbRegeneratePackageDoc -a +echo REGENERATING bbtk BOXES LISTS... +bbRegenerateBoxesLists +echo DONE! +pause \ No newline at end of file diff --git a/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/Rar.exe b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/Rar.exe new file mode 100644 index 0000000..cbf7b23 Binary files /dev/null and b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/Rar.exe differ diff --git a/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/batch01.bat b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/batch01.bat new file mode 100644 index 0000000..2a59642 --- /dev/null +++ b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/batch01.bat @@ -0,0 +1,27 @@ + +cd.. +mkdir tmp +cd tmp + +rem del *.exe +rem del *.msi +rem *.rar + +echo DOWNLOADING INSTALLERS, PLEASE WAIT... +..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/crea_ThirdParty/v1_0/graphviz-2.2.1.exe -O graphviz-Setup.exe +..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/crea_ThirdParty/v2_0/ActiveTcl8.5.4.0.286921-win32-ix86-threaded.exe -O ActiveTcl-Setup.exe +..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/crea_ThirdParty/v2_0/crea_ThirdParty_dlls-0.2.0-win32.exe -O crea_ThirdParty_dlls-Setup.exe + +..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/vv/v1_0_0/vv-1.0.0-win32.exe -O vv-Setup.exe + +..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/crea/v0_2_0/crea-0.2.0-win32.exe -O crea-Setup.exe +..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/bbtk/v0_9_1/BBTK-0.9.1-win32.exe -O bbtk-Setup.exe +..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/creaImageIO/v0_2_1/creaImageIO-0.2.1-win32.exe -O creaImageIO-Setup.exe + +rem LG 15/01/09 : these packages do not work ! +rem ..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/creaEnvironment/v1_0_0/creaEnvironment-1.0.0-win32.exe -O creaEnvironment-Setup.exe +rem ..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/creaMaracasVisu/v1_0_0/creaMaracasVisu-1.0.0-win32.exe -O creaMaracasVisu-Setup.exe +rem ..\bin\wget -nv http://www.creatis.insa-lyon.fr/software/creatools/creaContours/v1_2_0/creaContours-1.2.0-win32.exe -O creaContours-Setup.exe + +copy ..\bin\batch02.bat . +batch02.bat diff --git a/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/batch02.bat b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/batch02.bat new file mode 100644 index 0000000..f8e1fde --- /dev/null +++ b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/batch02.bat @@ -0,0 +1,33 @@ +echo STARTING vv INSTALLER... +vv-Setup.exe + +echo STARTING crea_ThirdParty_dlls INSTALLER... +crea_ThirdParty_dlls-Setup.exe + +echo STARTING graphviz INSTALLER... +graphviz-Setup.exe + +echo STARTING ActiveTcl INSTALLER... +ActiveTcl-Setup.exe + +echo STARTING crea INSTALLER... +crea-Setup.exe + +echo STARTING bbtk INSTALLER... +bbtk-Setup.exe + +echo STARTING creaImageIO INSTALLER... +creaImageIO-Setup.exe + +rem echo STARTING creaEnvironment INSTALLER... +rem creaEnvironment-Setup.exe + +rem echo STARTING creaMaracasVisu INSTALLER... +rem creaMaracasVisu-Setup.exe + +rem echo STARTING creaContours INSTALLER... +rem creaContours-Setup.exe + +echo DONE ! +echo *** DO NOT FORGET TO RUN PostInstall.bat *** +pause \ No newline at end of file diff --git a/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/wget.exe b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/wget.exe new file mode 100644 index 0000000..1b15a04 Binary files /dev/null and b/windows/creaTools_win_installers/CreaTools_v2_0_0_win32_installer/bin/wget.exe differ diff --git a/windows/crea_ThirdParty_dlls/install/CMakeLists.txt b/windows/crea_ThirdParty_dlls/install/CMakeLists.txt index 60ed93b..796671f 100644 --- a/windows/crea_ThirdParty_dlls/install/CMakeLists.txt +++ b/windows/crea_ThirdParty_dlls/install/CMakeLists.txt @@ -58,11 +58,11 @@ IF (WIN32) INSTALL( FILES ${WINDIR}/system32/msvcr71d.dll DESTINATION bin/ ) IF(USE_VTK) - SET(VTK_BIN_DIR ${VTK_DIR}/bin/Debug ) + SET(VTK_BIN_DIR ${VTK_DIR}/bin/relwithdebinfo ) FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll") FOREACH( iLST ${LST_FILE_VTKDLL} ) - INSTALL( + INSTALL( FILES ${iLST} DESTINATION bin/ ) @@ -70,10 +70,25 @@ IF (WIN32) ENDIF(USE_VTK) IF(USE_ITK) - INSTALL( FILES ${ITK_DIR}/bin/Debug/ITKCommon.dll DESTINATION bin/ ) + INSTALL( FILES ${ITK_DIR}/bin/relwithdebinfo/ITKCommon.dll DESTINATION bin/ ) ENDIF(USE_ITK) IF(USE_WXWIDGETS) + # Release dlls + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_xrc_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_richtext_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_qa_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_media_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_html_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_gl_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_core_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_aui_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28_adv_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_xml_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_odbc_vc_custom.dll DESTINATION bin/ ) + INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28_net_vc_custom.dll DESTINATION bin/ ) + # Debug dlls INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll DESTINATION bin/ ) INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll DESTINATION bin/ ) INSTALL( FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll DESTINATION bin/ ) @@ -91,17 +106,17 @@ IF (WIN32) IF(USE_GDCM) - INSTALL( FILES ${GDCM_DIR}/bin/Debug/gdcm.dll DESTINATION bin/ ) - INSTALL( FILES ${GDCM_DIR}/bin/Debug/gdcmjpeg8.dll DESTINATION bin/ ) - INSTALL( FILES ${GDCM_DIR}/bin/Debug/gdcmjpeg12.dll DESTINATION bin/ ) - INSTALL( FILES ${GDCM_DIR}/bin/Debug/gdcmjpeg16.dll DESTINATION bin/ ) - INSTALL( FILES ${GDCM_DIR}/bin/Debug/gdcmopenjpeg.dll DESTINATION bin/ ) - INSTALL( FILES ${GDCM_DIR}/bin/Debug/vtkgdcm.dll DESTINATION bin/ ) + INSTALL( FILES ${GDCM_DIR}/bin/relwithdebinfo/gdcm.dll DESTINATION bin/ ) + INSTALL( FILES ${GDCM_DIR}/bin/relwithdebinfo/gdcmjpeg8.dll DESTINATION bin/ ) + INSTALL( FILES ${GDCM_DIR}/bin/relwithdebinfo/gdcmjpeg12.dll DESTINATION bin/ ) + INSTALL( FILES ${GDCM_DIR}/bin/relwithdebinfo/gdcmjpeg16.dll DESTINATION bin/ ) + INSTALL( FILES ${GDCM_DIR}/bin/relwithdebinfo/gdcmopenjpeg.dll DESTINATION bin/ ) + INSTALL( FILES ${GDCM_DIR}/bin/relwithdebinfo/vtkgdcm.dll DESTINATION bin/ ) ENDIF(USE_GDCM) IF(USE_KWWIDGETS) - INSTALL( FILES ${KWWidgets_DIR}/bin/Debug/KWWidgets.dll DESTINATION bin/ ) + INSTALL( FILES ${KWWidgets_DIR}/bin/relwithdebinfo/KWWidgets.dll DESTINATION bin/ ) ENDIF(USE_KWWIDGETS)