Merge branch 'backport-3.19-rel-file-table' into release-3.19

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@-Darwin-x86_64\.dmg"
-"cmake-@version@-Darwin-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"
@@ -19,18 +23,22 @@
 "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\[\] \| \. == "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
 "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@-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\.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@-macos10\.10-universal\.dmg"
+"cmake-@version@-macos10\.10-universal\.tar\.gz"
 -- query: \.hashFiles\[\] \| select\(\.algorithm\[\] \| \. == "SHA-256"\) \| \.name
 "cmake-@version@-SHA-256\.txt"$

Tests/RunCMake/CMakeRelease/FileTable.cmake

@@ -10,9 +10,10 @@ 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.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}")

Utilities/Release/files-v1.json.in

@@ -7,6 +7,18 @@
     "string": "@version@"
   },
   "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"],
@@ -21,17 +33,31 @@
     },
     {
       "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.13"
     },
     {
       "os": ["macos", "macOS"],
-      "architecture": ["x86_64"],
+      "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@-Darwin-x86_64.tar.gz",
-      "macOSmin": "10.7"
+      "name": "cmake-@version@-macos10.10-universal.tar.gz",
+      "macOSmin": "10.10"
     },
     {
       "os": ["windows", "Windows"],

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.13"``.
 
 ``hashFiles``
   A JSON array of entries corresponding to files containing cryptographic
@@ -140,18 +142,25 @@ 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 ``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 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