diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-21 16:08:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-21 16:08:31 (GMT) |
| commit | 7fc013a9229087cbafeb9ff4c96d1d1acb71c5d6 (patch) | |
| tree | ffebf23c327e168693bb65d3d32ecd63dba8b228 | |
| parent | 89ede9c3e4f55c2aff9b9569c010d8101e00a41e (diff) | |
| parent | 2167fce99befa565c3a70d09a2be65a865a2f23a (diff) | |
| download | CMake-7fc013a9229087cbafeb9ff4c96d1d1acb71c5d6.zip CMake-7fc013a9229087cbafeb9ff4c96d1d1acb71c5d6.tar.gz CMake-7fc013a9229087cbafeb9ff4c96d1d1acb71c5d6.tar.bz2 | |
Merge topic 'rel-macos-dmg-no-sla'
2167fce99b Utilities/Release: Drop SLA from CMake macOS DMG package
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7192
| -rw-r--r-- | CMakeCPack.cmake | 1 | ||||
| -rw-r--r-- | Help/release/dev/rel-macos-dmg-no-sla.rst | 7 | ||||
| -rwxr-xr-x | Utilities/Release/macos/sign-notarize.bash | 9 |
3 files changed, 8 insertions, 9 deletions
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index 9357804..38fec3f 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -22,6 +22,7 @@ set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(CPACK_PACKAGE_VERSION "${CMake_VERSION}") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "cmake-${CMake_VERSION}") +set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE OFF) # Installers for 32- vs. 64-bit CMake: # - Root install directory (displayed to end user at installer-run time) diff --git a/Help/release/dev/rel-macos-dmg-no-sla.rst b/Help/release/dev/rel-macos-dmg-no-sla.rst new file mode 100644 index 0000000..2f20aab --- /dev/null +++ b/Help/release/dev/rel-macos-dmg-no-sla.rst @@ -0,0 +1,7 @@ +rel-macos-dmg-no-sla +-------------------- + +* The precompiled macOS binaries provided on + `cmake.org <https://cmake.org/download/>`_ no longer attach a SLA + to the ``.dmg`` packages. This was removed because macOS 12 deprecated + the tools used to attach ``.dmg`` resources. diff --git a/Utilities/Release/macos/sign-notarize.bash b/Utilities/Release/macos/sign-notarize.bash index 8283c90..fe27afe 100755 --- a/Utilities/Release/macos/sign-notarize.bash +++ b/Utilities/Release/macos/sign-notarize.bash @@ -77,12 +77,6 @@ echo '<?xml version="1.0" encoding="UTF-8"?> </dict> </plist>' > "$entitlements_xml" -# Extract SLA -readonly sla_xml="$tmpdir/sla.xml" -hdiutil udifderez -xml "$dmg" > "$sla_xml" -plutil -remove 'blkx' "$sla_xml" -plutil -remove 'plst' "$sla_xml" - # Convert from read-only original image to read-write. readonly udrw_dmg="$tmpdir/udrw.dmg" hdiutil convert "$dmg" -format UDRW -o "${udrw_dmg}" @@ -112,6 +106,3 @@ hdiutil detach "$vol_path" # Convert back to read-only, compressed image. hdiutil convert "${udrw_dmg}" -format UDZO -imagekey zlib-level=9 -ov -o "$dmg" - -# Re-insert SLA. -hdiutil udifrez -xml "${sla_xml}" 'FIXME_WHY_IS_THIS_ARGUMENT_NEEDED' "$dmg" |