diff options
| -rw-r--r-- | Tests/RunCMake/CMakeRelease/FileTable-stdout.txt | 16 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeRelease/FileTable.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Release/files-v1.json.in | 12 | ||||
| -rw-r--r-- | Utilities/Release/files-v1.rst | 8 |
4 files changed, 20 insertions, 18 deletions
diff --git a/Tests/RunCMake/CMakeRelease/FileTable-stdout.txt b/Tests/RunCMake/CMakeRelease/FileTable-stdout.txt index 441e9b0df3..50b37117a9 100644 --- a/Tests/RunCMake/CMakeRelease/FileTable-stdout.txt +++ b/Tests/RunCMake/CMakeRelease/FileTable-stdout.txt @@ -7,8 +7,8 @@ -- query: \.files\[\]\.name "cmake-@version@-Linux-x86_64\.sh" "cmake-@version@-Linux-x86_64\.tar\.gz" -"cmake-@version@-Darwin-x86_64\.dmg" -"cmake-@version@-Darwin-x86_64\.tar\.gz" +"cmake-@version@-macos-universal\.dmg" +"cmake-@version@-macos-universal\.tar\.gz" "cmake-@version@-win32-x86\.msi" "cmake-@version@-win32-x86\.zip" "cmake-@version@-win64-x64\.msi" @@ -19,18 +19,18 @@ "cmake-@version@\.tar\.gz" "cmake-@version@\.zip" -- query: \.files\[\] \| select\(\(\.os\[\] \| \. == "macOS"\) and \(\.class == "volume"\)\) \| \.name -"cmake-@version@-Darwin-x86_64\.dmg" +"cmake-@version@-macos-universal\.dmg" -- query: \.files\[\] \| select\(\(\.os\[\] \| \. == "windows"\) and \(\.architecture\[\] \| \. == "i386"\) and \(\.class == "installer"\)\) \| \.name "cmake-@version@-win32-x86\.msi" -- query: \.files\[\] \| select\(\.architecture\[\] \| \. == "x86_64"\) \| \.name "cmake-@version@-Linux-x86_64\.sh" "cmake-@version@-Linux-x86_64\.tar\.gz" -"cmake-@version@-Darwin-x86_64\.dmg" -"cmake-@version@-Darwin-x86_64\.tar\.gz" +"cmake-@version@-macos-universal\.dmg" +"cmake-@version@-macos-universal\.tar\.gz" "cmake-@version@-win64-x64\.msi" "cmake-@version@-win64-x64\.zip" --- query: \.files\[\] \| select\(\[\.macOSmin\] \| inside\(\["10\.7", "10\.8", "10\.9"\]\)\) \| \.name -"cmake-@version@-Darwin-x86_64\.dmg" -"cmake-@version@-Darwin-x86_64\.tar\.gz" +-- query: \.files\[\] \| select\(\[\.macOSmin\] \| inside\(\["10\.10", "10\.11", "10\.12"\]\)\) \| \.name +"cmake-@version@-macos-universal\.dmg" +"cmake-@version@-macos-universal\.tar\.gz" -- query: \.hashFiles\[\] \| select\(\.algorithm\[\] \| \. == "SHA-256"\) \| \.name "cmake-@version@-SHA-256\.txt"$ diff --git a/Tests/RunCMake/CMakeRelease/FileTable.cmake b/Tests/RunCMake/CMakeRelease/FileTable.cmake index 1bddeb8787..55e69555ea 100644 --- a/Tests/RunCMake/CMakeRelease/FileTable.cmake +++ b/Tests/RunCMake/CMakeRelease/FileTable.cmake @@ -12,7 +12,7 @@ foreach(query ".files[] | select((.os[] | . == \"macOS\") and (.class == \"volume\")) | .name" ".files[] | select((.os[] | . == \"windows\") and (.architecture[] | . == \"i386\") and (.class == \"installer\")) | .name" ".files[] | select(.architecture[] | . == \"x86_64\") | .name" - ".files[] | select([.macOSmin] | inside([\"10.7\", \"10.8\", \"10.9\"])) | .name" + ".files[] | select([.macOSmin] | inside([\"10.10\", \"10.11\", \"10.12\"])) | .name" ".hashFiles[] | select(.algorithm[] | . == \"SHA-256\") | .name" ) message(STATUS "query: ${query}") diff --git a/Utilities/Release/files-v1.json.in b/Utilities/Release/files-v1.json.in index 8fef411eda..4d6b87599a 100644 --- a/Utilities/Release/files-v1.json.in +++ b/Utilities/Release/files-v1.json.in @@ -21,17 +21,17 @@ }, { "os": ["macos", "macOS"], - "architecture": ["x86_64"], + "architecture": ["arm64", "x86_64"], "class": "volume", - "name": "cmake-@version@-Darwin-x86_64.dmg", - "macOSmin": "10.7" + "name": "cmake-@version@-macos-universal.dmg", + "macOSmin": "10.10" }, { "os": ["macos", "macOS"], - "architecture": ["x86_64"], + "architecture": ["arm64", "x86_64"], "class": "archive", - "name": "cmake-@version@-Darwin-x86_64.tar.gz", - "macOSmin": "10.7" + "name": "cmake-@version@-macos-universal.tar.gz", + "macOSmin": "10.10" }, { "os": ["windows", "Windows"], diff --git a/Utilities/Release/files-v1.rst b/Utilities/Release/files-v1.rst index 4ee50df007..b7ca2fd71f 100644 --- a/Utilities/Release/files-v1.rst +++ b/Utilities/Release/files-v1.rst @@ -77,6 +77,8 @@ The members are: Binary packages have a non-empty list of architectures, with at least one name matching the output of ``uname -m`` on corresponding hosts. On Windows, architecture names include ``x86_64`` and ``i386``. + On macOS, universal binary packages list all architectures, + e.g. ``["arm64","x86_64"]``. ``class`` A JSON string naming the class of package. The value is one of: @@ -98,7 +100,7 @@ The members are: ``macOSmin`` Optional member that is present on package files for macOS. The value is a JSON string specifying the minimum version of macOS - required to run the binary, e.g. ``"10.7"``. + required to run the binary, e.g. ``"10.10"``. ``hashFiles`` A JSON array of entries corresponding to files containing cryptographic @@ -146,10 +148,10 @@ For example, one may use ``jq`` queries: (.architecture[] | . == "x86_64") and (.class == "archive")) | .name -* To select a macOS binary archive supporting ``x86_64`` hosts:: +* To select a macOS binary archive supporting ``arm64`` hosts:: .files[] | select((.os[] | . == "macos") and - (.architecture[] | . == "x86_64") and + (.architecture[] | . == "arm64") and (.class == "archive")) | .name * To select a SHA-256 hash file:: |