Skip to content

Commit f576077

Browse files
dg0ytdg0yt
authored
[vcpkg script] Update ninja to 1.12 (#41980)
1 parent 6220088 commit f576077

File tree

10 files changed

+89
-25
lines changed

10 files changed

+89
-25
lines changed

‎ports/libdatachannel/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
2020

2121
vcpkg_cmake_configure(
2222
SOURCE_PATH "${SOURCE_PATH}"
23+
DISABLE_PARALLEL_CONFIGURE # version.h configuration
2324
OPTIONS
2425
${FEATURE_OPTIONS}
2526
-DPREFER_SYSTEM_LIB=ON

‎ports/libdatachannel/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "libdatachannel",
33
"version-semver": "0.21.2",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
66
"homepage": "https://github.com/paullouisageneau/libdatachannel",
77
"license": "MPL-2.0",

‎ports/qt5-webengine/portfile.cmake‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}")
4545
vcpkg_add_to_path(PREPEND "${NINJA_DIR}")
4646
vcpkg_add_to_path(PREPEND "${NODEJS_DIR}")
4747

48+
vcpkg_execute_in_download_mode(
49+
COMMAND "${NINJA}" --version
50+
OUTPUT_VARIABLE ninja_version
51+
OUTPUT_STRIP_TRAILING_WHITESPACE
52+
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
53+
)
54+
if(ninja_version VERSION_GREATER_EQUAL "1.12.1")
55+
message(WARNING
56+
"Found ninja version ${ninja_version} which may fail to build ${PORT}."
57+
"You can supply a different filepath using per-port customization of CMake variable NINJA."
58+
)
59+
endif()
60+
4861
set(PATCHES common.pri.patch
4962
gl.patch
5063
build_1.patch

‎ports/qt5-webengine/vcpkg.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "qt5-webengine",
33
"version": "5.15.16",
4+
"port-version": 1,
45
"description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.",
56
"license": null,
67
"supports": "!static",

‎scripts/ci.baseline.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -917,12 +917,13 @@ qt5-canvas3d:x64-windows=skip
917917
qt5-canvas3d:x64-windows-static=skip
918918
qt5-canvas3d:x64-windows-static-md=skip
919919
qt5-canvas3d:x86-windows=skip
920+
# Skipped to avoid exceeding the 48 hour time limit in CI
921+
# May also need an older ninja version
922+
qt5-webengine:x64-windows=skip
923+
qt5-webengine:x86-windows=skip
920924
# Missing system libraries
921925
qt5-x11extras:x64-osx=skip
922926
qt5-x11extras:arm64-osx=skip
923-
# Skipped to avoid exceeding the 48 hour time limit in CI
924-
qt5-webengine:x86-windows=skip
925-
qt5-webengine:x64-windows=skip
926927
# Missing system libraries
927928
qtwayland:x64-osx=skip
928929
qtwayland:arm64-osx=skip

‎scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
11
set(program_name ninja)
2-
set(program_version 1.10.2)
2+
set(program_version 1.12.1)
33
set(version_command --version)
44
if(CMAKE_HOST_WIN32)
5-
set(download_filename "ninja-win-${program_version}.zip")
6-
set(tool_subdirectory "${program_version}-windows")
7-
set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip")
8-
set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3)
5+
if(DEFINED ENV{PROCESSOR_ARCHITEW6432})
6+
set(build_arch $ENV{PROCESSOR_ARCHITEW6432})
7+
else()
8+
set(build_arch $ENV{PROCESSOR_ARCHITECTURE})
9+
endif()
10+
if(build_arch MATCHES "^(ARM|arm)64$")
11+
set(download_filename "ninja-winarm64-${program_version}.zip")
12+
set(tool_subdirectory "${program_version}-windows-arm64")
13+
set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-winarm64.zip")
14+
set(download_sha512 b1826c422a677f47f9f7e001672ce831791b092e4f1cd84ddf2ea067781c31aa8246f26e91dd66300c23ffa77a8ea29910c48ccf7e4235ff20bccc2d2b6e247b)
15+
else()
16+
set(download_filename "ninja-win-${program_version}.zip")
17+
set(tool_subdirectory "${program_version}-windows")
18+
set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip")
19+
set(download_sha512 d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f)
20+
endif()
921
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
1022
set(download_filename "ninja-mac-${program_version}.zip")
1123
set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip")
1224
set(tool_subdirectory "${program_version}-osx")
1325
set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx")
14-
set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b)
26+
set(download_sha512 4c11f477359c9d1dcda72529a503a59948ec20b368992132e545d6d4f6e3aabfd1d6b1d0f32cf932626037959b24a7bb375ef901e2d002eabadc83a265cbc351)
1527
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
1628
set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd")
1729
else()
@@ -21,7 +33,13 @@ else()
2133
set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip")
2234
set(tool_subdirectory "${program_version}-linux")
2335
set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux")
24-
set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3)
36+
set(download_sha512 9c2ad534e7e72e67c608de7784cfbae601095bfca96713731a3f1eca268d66a6302f40c138a4ad97f7e8c902cd3fb05994a175e46fe922295dcc2d1334bf9014)
37+
elseif(HOST_ARCH MATCHES "arm64|aarch64|ARM64|AARCH64")
38+
set(download_filename "ninja-linux-aarch64-${program_version}.zip")
39+
set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux-aarch64.zip")
40+
set(tool_subdirectory "${program_version}-linux-aarch64")
41+
set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux-aarch64")
42+
set(download_sha512 22c46abb7e6d916e11713705f78d093e9b30029cb49cadc65755908ad9f44b3f2548105174cc615a5ef86c4672b366173f18bd04c2d71710a303d952c06db334)
2543
else()
2644
set(version_command "") # somewhat hacky way to skip version check and use system binary
2745
endif()

‎scripts/vcpkg-tools.json‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -230,34 +230,54 @@
230230
"sha512": "3bb32b7d55347d1af37c6f4ebf0e20b38ce51c37a1baf92f7ad1762000539a03413dd679a6d902fdb1805fa71917300c9692aceee012eb06ecdff10491137aec",
231231
"archive": "aria2-1.35.0-osx-darwin.tar.bz2"
232232
},
233+
{
234+
"name": "ninja",
235+
"os": "windows",
236+
"arch": "arm64",
237+
"version": "1.12.1",
238+
"executable": "ninja.exe",
239+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-winarm64.zip",
240+
"sha512": "b1826c422a677f47f9f7e001672ce831791b092e4f1cd84ddf2ea067781c31aa8246f26e91dd66300c23ffa77a8ea29910c48ccf7e4235ff20bccc2d2b6e247b",
241+
"archive": "ninja-winarm64-1.12.1.zip"
242+
},
233243
{
234244
"name": "ninja",
235245
"os": "windows",
236246
"arch": "x64",
237-
"version": "1.11.1",
247+
"version": "1.12.1",
238248
"executable": "ninja.exe",
239-
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip",
240-
"sha512": "a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199",
241-
"archive": "ninja-win-1.11.1.zip"
249+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip",
250+
"sha512": "d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f",
251+
"archive": "ninja-win-1.12.1.zip"
252+
},
253+
{
254+
"name": "ninja",
255+
"os": "linux",
256+
"arch": "arm64",
257+
"version": "1.12.1",
258+
"executable": "ninja",
259+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux-aarch64.zip",
260+
"sha512": "22c46abb7e6d916e11713705f78d093e9b30029cb49cadc65755908ad9f44b3f2548105174cc615a5ef86c4672b366173f18bd04c2d71710a303d952c06db334",
261+
"archive": "ninja-linux-aarch64-1.12.1.zip"
242262
},
243263
{
244264
"name": "ninja",
245265
"os": "linux",
246266
"arch": "x64",
247-
"version": "1.11.1",
267+
"version": "1.12.1",
248268
"executable": "ninja",
249-
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip",
250-
"sha512": "6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde",
251-
"archive": "ninja-linux-1.11.1.zip"
269+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip",
270+
"sha512": "9c2ad534e7e72e67c608de7784cfbae601095bfca96713731a3f1eca268d66a6302f40c138a4ad97f7e8c902cd3fb05994a175e46fe922295dcc2d1334bf9014",
271+
"archive": "ninja-linux-1.12.1.zip"
252272
},
253273
{
254274
"name": "ninja",
255275
"os": "osx",
256-
"version": "1.11.1",
276+
"version": "1.12.1",
257277
"executable": "ninja",
258-
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip",
259-
"sha512": "dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427",
260-
"archive": "ninja-mac-1.11.1.zip"
278+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip",
279+
"sha512": "4c11f477359c9d1dcda72529a503a59948ec20b368992132e545d6d4f6e3aabfd1d6b1d0f32cf932626037959b24a7bb375ef901e2d002eabadc83a265cbc351",
280+
"archive": "ninja-mac-1.12.1.zip"
261281
},
262282
{
263283
"name": "powershell-core",

‎versions/baseline.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4422,7 +4422,7 @@
44224422
},
44234423
"libdatachannel": {
44244424
"baseline": "0.21.2",
4425-
"port-version": 1
4425+
"port-version": 2
44264426
},
44274427
"libdatrie": {
44284428
"baseline": "0.2.13",
@@ -7530,7 +7530,7 @@
75307530
},
75317531
"qt5-webengine": {
75327532
"baseline": "5.15.16",
7533-
"port-version": 0
7533+
"port-version": 1
75347534
},
75357535
"qt5-webglplugin": {
75367536
"baseline": "5.15.16",

‎versions/l-/libdatachannel.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "bdae5c743dedd26494c0c49587b1eef0bdffe042",
5+
"version-semver": "0.21.2",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "df0663ab881ed7a331bf51b6bf652e80fc55dbf4",
510
"version-semver": "0.21.2",

‎versions/q-/qt5-webengine.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "92f56035f25cfc039d74c70b6905c1b78e480e2e",
5+
"version": "5.15.16",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "b49c1e293ead06cecbbc431801688483b0473f3e",
510
"version": "5.15.16",

0 commit comments

Comments
 (0)