Commit: 50ad4428ac76705dc28e4cd85272a47118b6a654 Author: Lazydodo Date: Thu Aug 15 13:43:27 2019 -0600 Branches: master https://developer.blender.org/rB50ad4428ac76705dc28e4cd85272a47118b6a654
Windows/MSI: Rework MSI installer. The installer always upgraded the last version installed and did not allow for two versions to be installed side by side. The reworked installer will allow side by side installs install order: ``` 2.81 -> 2.81a -> 2.82 : Allowed , will result in both 2.82 and 2.81a being installed 2.82 -> 2.81 -> 2.81a : Allowed , will result in both 2.82 and 2.81a being installed 2.82 -> 2.81a : Allowed , will result in both 2.82 and 2.81a being installed 2.82 -> 2.81a -> 2.81 : Not Allowed, 2.81 will only install if you manually remove 2.81a first. ``` Do note though that this will not apply to any previously issued installers and even for 2.80a this is not something we can fix. This patch is for landing in 2.81 *only* and should be excluded from any possible 2.80a release. Second change is a change to the compression level, building the MSI takes 30 minutes, which is crazy, perhaps worth it if the compression actually pays of. ``` MSI - none 1:35 247.0 MB (260,025,634 bytes) MSI - mszip 2:02 89.6 MB ( 94,022,946 bytes) MSI - low 2:35 81.6 MB ( 85,646,626 bytes) MSI - medium 4:11 77.3 MB ( 81,136,930 bytes) MSI - high 28:01 74.7 MB ( 78,384,418 bytes) zip 1:32 93.2 MB ( 97,732,293 bytes) 7Z 2:22 65.0 MB ( 68,171,614 bytes) ``` It didn't, so I lowered it to medium, seemed reasonable. Differential Revision: https://developer.blender.org/D5494 Reviewers: brecht, jesterking =================================================================== M build_files/cmake/packaging.cmake =================================================================== diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index 06a97fc9abb..5ace42646c5 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -80,22 +80,28 @@ if(APPLE) endif() if(WIN32) - set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender") - set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender ${MAJOR_VERSION}.${MINOR_VERSION}") + set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender ${MAJOR_VERSION}.${MINOR_VERSION}") set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) set(CPACK_NSIS_COMPRESSOR "/SOLID lzma") set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt) set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) - set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A") + + set(BLENDER_NAMESPACE_GUID "507F933F-5898-404A-9A05-18282FD491A6") + + string(UUID CPACK_WIX_UPGRADE_GUID + NAMESPACE ${BLENDER_NAMESPACE_GUID} + NAME ${CPACK_PACKAGE_INSTALL_DIRECTORY} + TYPE SHA1 UPPER + ) set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template) set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp) set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp) - #force lzma instead of deflate - set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:high) + set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium) endif() set(CPACK_PACKAGE_EXECUTABLES "blender" "blender") _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
