From 2c3dd0479a11737cc528fb6491d80f552c597242 Mon Sep 17 00:00:00 2001
From: Leander Schulten <Leander.Schulten@rwth-aachen.de>
Date: Sun, 23 Oct 2022 15:30:21 +0200
Subject: [PATCH] [vcpkg-tool-nodejs] update
---
ports/vcpkg-tool-nodejs/portfile.cmake | 29 +++++++++++++++-----------
ports/vcpkg-tool-nodejs/vcpkg.json | 2 +-
versions/baseline.json | 2 +-
versions/v-/vcpkg-tool-nodejs.json | 5 +++++
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/ports/vcpkg-tool-nodejs/portfile.cmake b/ports/vcpkg-tool-nodejs/portfile.cmake
index c7dd8e17b18034..2607cc475dc1d9 100644
--- a/ports/vcpkg-tool-nodejs/portfile.cmake
+++ b/ports/vcpkg-tool-nodejs/portfile.cmake
@@ -1,7 +1,6 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
set(PROGNAME node)
-set(PROG_VERSION 14.17.4)
set(BREW_PACKAGE_NAME "${PROGNAME}")
set(APT_PACKAGE_NAME "${PROGNAME}")
@@ -10,26 +9,34 @@ if(VCPKG_CROSSCOMPILING)
message(FATAL_ERROR "This is a host only port!")
endif()
-set(BASE_URL "https://nodejs.org/dist/v${PROG_VERSION}/")
+set(BASE_URL "https://nodejs.org/dist/v${VERSION}/")
set(ARCHIVE "")
set(ARCHIVE_EXT "")
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^x86$|arm")
- set(ARCHIVE "node-v${PROG_VERSION}-win-x86")
+ set(ARCHIVE "node-v${VERSION}-win-x86")
set(ARCHIVE_EXT ".zip")
- set(HASH 82ea09a10f20ecab860b9e15b2cc72eec4a60ac5f20680f7846f37c5c1422d38d448cd7a71382cbb41101c1382412368bb74bf1a0bd7698f7ba882e022ae7304)
+ set(HASH a52f07888452a894008f5ec69d20b2d48a08656a84197e2c94749b909fc66d9b9217ae30b10cfdec36dd11d9fdecb0c64b511570ded6a63dfd794b07a9fb0f52)
elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
- set(ARCHIVE "node-v${PROG_VERSION}-win-x64")
+ set(ARCHIVE "node-v${VERSION}-win-x64")
set(ARCHIVE_EXT ".zip")
- set(HASH 9a067c9ac5abc8d6af756b9a5344beee552f877a54833bdfa3a88e694359831f4edc9fac9c2c29b2f02f859e79bfeb4b91735e70c02c9daddf3e82efbfcbe46c)
+ set(HASH e6a5688bfcd869eca6d220ef9cbcfa1f50f93f0a86d25acc96103fe271c3f362a94159c3d54d43b2cc7a4eeef4fdcde2b5da4163d24bd2c4ecaddae2486f4be6)
elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
- set(ARCHIVE "node-v${PROG_VERSION}-darwin-x64")
+ set(ARCHIVE "node-v${VERSION}-darwin-x64")
set(ARCHIVE_EXT ".tar.gz")
- set(HASH 76575afb5711c6fbccd45ef319d6c3960d0363808a0703e7e9ed5c637fe19af63a8ff6eb08182df77c7620d50a42bf9fd324489466556a1b5895f0f2aebb8a5a)
+ set(HASH eb22c1e2201bcce63d68c471bba0e74ccf3c55b65b47519711e4da06d03d410f129aa587cf009db1f1253402ea26286e13ed29d231fe6074fcf7414c1f216f13)
+elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+ set(ARCHIVE "node-v${VERSION}-darwin-arm64")
+ set(ARCHIVE_EXT ".tar.gz")
+ set(HASH 62585571b993c5643924f13fd90457c116bd839e02c6878e64da66989ee967a965529490afca62abc5866120d8ea089c3dc9d565d1a3f4a986be0c674a10151b)
elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
- set(ARCHIVE "node-v${PROG_VERSION}-linux-x64")
+ set(ARCHIVE "node-v${VERSION}-linux-x64")
+ set(ARCHIVE_EXT ".tar.xz")
+ set(HASH 06b27edd123a4465d7919b07bb5894a805f29fb757669fa84fe5595dfda7b114c423c99bf62e31400d8c3e7d9f3fde54138416711e05d69afc922a35b013a9b1)
+elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+ set(ARCHIVE "node-v${VERSION}-linux-arm64")
set(ARCHIVE_EXT ".tar.xz")
- set(HASH 696af62f78147dc20e15364ba7fea6f707b0d5e3c9ae925975d64ec7dc90db4f27a3e5e90307a26bf48b05e0096ab34144d29cd9379b70b384cbd3144bf8cd85)
+ set(HASH 77c8618576c2337ed6b767d8d04871c46b92a4a411fcf5d294145dbceb467a4b0804b3b4e82c637fdc6703f1c86a22ac3e56f69142ef505c2252f88675333c57)
else()
message(FATAL_ERROR "Target not yet supported by '${PORT}'")
endif()
@@ -51,7 +58,5 @@ vcpkg_execute_in_download_mode(
COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}"
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools"
)
-file(GLOB_RECURSE folders "${CURRENT_PACKAGES_DIR}/tools/*" LIST_DIRECTORIES true)
-message(STATUS "Files and Folders: '${folders}'")
file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/node")
diff --git a/ports/vcpkg-tool-nodejs/vcpkg.json b/ports/vcpkg-tool-nodejs/vcpkg.json
index aed974a26e1a27..b33581cf1c5b62 100644
--- a/ports/vcpkg-tool-nodejs/vcpkg.json
+++ b/ports/vcpkg-tool-nodejs/vcpkg.json
@@ -1,5 +1,5 @@
{
"name": "vcpkg-tool-nodejs",
- "version-semver": "14.17.4",
+ "version-semver": "16.18.0",
"supports": "native"
}
diff --git a/versions/baseline.json b/versions/baseline.json
index 32b4280b1759e8..2012fc30ce8a39 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7769,7 +7769,7 @@
"port-version": 1
},
"vcpkg-tool-nodejs": {
- "baseline": "14.17.4",
+ "baseline": "16.18.0",
"port-version": 0
},
"vcpkg-tool-python2": {
diff --git a/versions/v-/vcpkg-tool-nodejs.json b/versions/v-/vcpkg-tool-nodejs.json
index fc5994031eec63..efce62cacc3498 100644
--- a/versions/v-/vcpkg-tool-nodejs.json
+++ b/versions/v-/vcpkg-tool-nodejs.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "4d06168d3fdce7bd667e9cbc44adc453167dfbcc",
+ "version-semver": "16.18.0",
+ "port-version": 0
+ },
{
"git-tree": "91407db5ac964382618c11765caafc444e684a19",
"version-semver": "14.17.4",