From 30959aec8f1347ac2098f85824fe6777dae627b5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 31 Mar 2021 12:24:35 -0400 Subject: Utilities/Release: Update file table for 3.19.3 --- Tests/RunCMake/CMakeRelease/FileTable-stdout.txt | 12 ++++++++-- Tests/RunCMake/CMakeRelease/FileTable.cmake | 1 + Utilities/Release/files-v1.json.in | 28 +++++++++++++++++++++++- Utilities/Release/files-v1.rst | 13 ++++++++--- 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/Tests/RunCMake/CMakeRelease/FileTable-stdout.txt b/Tests/RunCMake/CMakeRelease/FileTable-stdout.txt index 50b3711..011673f 100644 --- a/Tests/RunCMake/CMakeRelease/FileTable-stdout.txt +++ b/Tests/RunCMake/CMakeRelease/FileTable-stdout.txt @@ -5,10 +5,14 @@ "rc4" "@version@" -- query: \.files\[\]\.name +"cmake-@version@-Linux-aarch64\.sh" +"cmake-@version@-Linux-aarch64\.tar\.gz" "cmake-@version@-Linux-x86_64\.sh" "cmake-@version@-Linux-x86_64\.tar\.gz" "cmake-@version@-macos-universal\.dmg" "cmake-@version@-macos-universal\.tar\.gz" +"cmake-@version@-macos10\.10-universal\.dmg" +"cmake-@version@-macos10\.10-universal\.tar\.gz" "cmake-@version@-win32-x86\.msi" "cmake-@version@-win32-x86\.zip" "cmake-@version@-win64-x64\.msi" @@ -20,6 +24,8 @@ "cmake-@version@\.zip" -- query: \.files\[\] \| select\(\(\.os\[\] \| \. == "macOS"\) and \(\.class == "volume"\)\) \| \.name "cmake-@version@-macos-universal\.dmg" +-- query: \.files\[\] \| select\(\(\.os\[\] \| \. == "macos10\.10"\) and \(\.class == "archive"\)\) \| \.name +"cmake-@version@-macos10\.10-universal\.tar\.gz" -- query: \.files\[\] \| select\(\(\.os\[\] \| \. == "windows"\) and \(\.architecture\[\] \| \. == "i386"\) and \(\.class == "installer"\)\) \| \.name "cmake-@version@-win32-x86\.msi" -- query: \.files\[\] \| select\(\.architecture\[\] \| \. == "x86_64"\) \| \.name @@ -27,10 +33,12 @@ "cmake-@version@-Linux-x86_64\.tar\.gz" "cmake-@version@-macos-universal\.dmg" "cmake-@version@-macos-universal\.tar\.gz" +"cmake-@version@-macos10\.10-universal\.dmg" +"cmake-@version@-macos10\.10-universal\.tar\.gz" "cmake-@version@-win64-x64\.msi" "cmake-@version@-win64-x64\.zip" -- query: \.files\[\] \| select\(\[\.macOSmin\] \| inside\(\["10\.10", "10\.11", "10\.12"\]\)\) \| \.name -"cmake-@version@-macos-universal\.dmg" -"cmake-@version@-macos-universal\.tar\.gz" +"cmake-@version@-macos10\.10-universal\.dmg" +"cmake-@version@-macos10\.10-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 55e6955..f46535c 100644 --- a/Tests/RunCMake/CMakeRelease/FileTable.cmake +++ b/Tests/RunCMake/CMakeRelease/FileTable.cmake @@ -10,6 +10,7 @@ foreach(query ".files[].name" ".files[] | select(.os[] | . == \"source\") | .name" ".files[] | select((.os[] | . == \"macOS\") and (.class == \"volume\")) | .name" + ".files[] | select((.os[] | . == \"macos10.10\") and (.class == \"archive\")) | .name" ".files[] | select((.os[] | . == \"windows\") and (.architecture[] | . == \"i386\") and (.class == \"installer\")) | .name" ".files[] | select(.architecture[] | . == \"x86_64\") | .name" ".files[] | select([.macOSmin] | inside([\"10.10\", \"10.11\", \"10.12\"])) | .name" diff --git a/Utilities/Release/files-v1.json.in b/Utilities/Release/files-v1.json.in index 4d6b875..6bafa69 100644 --- a/Utilities/Release/files-v1.json.in +++ b/Utilities/Release/files-v1.json.in @@ -9,6 +9,18 @@ "files": [ { "os": ["linux", "Linux"], + "architecture": ["aarch64"], + "class": "installer", + "name": "cmake-@version@-Linux-aarch64.sh" + }, + { + "os": ["linux", "Linux"], + "architecture": ["aarch64"], + "class": "archive", + "name": "cmake-@version@-Linux-aarch64.tar.gz" + }, + { + "os": ["linux", "Linux"], "architecture": ["x86_64"], "class": "installer", "name": "cmake-@version@-Linux-x86_64.sh" @@ -24,13 +36,27 @@ "architecture": ["arm64", "x86_64"], "class": "volume", "name": "cmake-@version@-macos-universal.dmg", - "macOSmin": "10.10" + "macOSmin": "10.13" }, { "os": ["macos", "macOS"], "architecture": ["arm64", "x86_64"], "class": "archive", "name": "cmake-@version@-macos-universal.tar.gz", + "macOSmin": "10.13" + }, + { + "os": ["macos10.10", "macOS10.10"], + "architecture": ["arm64", "x86_64"], + "class": "volume", + "name": "cmake-@version@-macos10.10-universal.dmg", + "macOSmin": "10.10" + }, + { + "os": ["macos10.10", "macOS10.10"], + "architecture": ["arm64", "x86_64"], + "class": "archive", + "name": "cmake-@version@-macos10.10-universal.tar.gz", "macOSmin": "10.10" }, { diff --git a/Utilities/Release/files-v1.rst b/Utilities/Release/files-v1.rst index b7ca2fd..3b916d4 100644 --- a/Utilities/Release/files-v1.rst +++ b/Utilities/Release/files-v1.rst @@ -100,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.10"``. + required to run the binary, e.g. ``"10.13"``. ``hashFiles`` A JSON array of entries corresponding to files containing cryptographic @@ -142,10 +142,10 @@ For example, one may use ``jq`` queries: (.architecture[] | . == "x86_64") and (.class == "archive")) | .name -* To select a Linux binary archive supporting ``x86_64`` hosts:: +* To select a Linux binary archive supporting ``aarch64`` hosts:: .files[] | select((.os[] | . == "linux") and - (.architecture[] | . == "x86_64") and + (.architecture[] | . == "aarch64") and (.class == "archive")) | .name * To select a macOS binary archive supporting ``arm64`` hosts:: @@ -154,6 +154,13 @@ For example, one may use ``jq`` queries: (.architecture[] | . == "arm64") and (.class == "archive")) | .name +* To select a macOS binary archive supporting macOS 10.12 on ``x86_64`` hosts:: + + .files[] | select((.os[] | contains("macOS")) and + (.architecture[] | . == "x86_64") and + ([.macOSmin] | inside(["10.10", "10.11", "10.12"])) + ) | .name + * To select a SHA-256 hash file:: .hashFiles[] | select(.algorithm[] | . == "SHA-256") | .name -- cgit v0.12