Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ports/vcpkg-tool-nodejs/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,8 @@ vcpkg_execute_in_download_mode(
)

file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/node")

# Do not break code signatures
if(VCPKG_TARGET_IS_OSX)
set(VCPKG_FIXUP_MACHO_RPATH OFF)
endif()
2 changes: 1 addition & 1 deletion ports/vcpkg-tool-nodejs/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vcpkg-tool-nodejs",
"version-semver": "16.18.0",
"port-version": 1,
"port-version": 2,
"supports": "native"
}
20 changes: 20 additions & 0 deletions scripts/test_ports/vcpkg-ci-vcpkg-tool-nodejs/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

find_program(NODEJS
NAMES node
PATHS
"${CURRENT_INSTALLED_DIR}/tools/node"
"${CURRENT_INSTALLED_DIR}/tools/node/bin"
NO_DEFAULT_PATH
REQUIRED
)
execute_process(
COMMAND "${NODEJS}" --version
COMMAND_ECHO STDOUT
COMMAND_ERROR_IS_FATAL ANY
)
execute_process(
COMMAND "${NODEJS}" -p "process.arch"
COMMAND_ECHO STDOUT
COMMAND_ERROR_IS_FATAL ANY
)
9 changes: 9 additions & 0 deletions scripts/test_ports/vcpkg-ci-vcpkg-tool-nodejs/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "vcpkg-ci-vcpkg-tool-nodejs",
"version-string": "ci",
"description": "Test port to validate vcpkg-tool-nodejs",
"supports": "native",
"dependencies": [
"vcpkg-tool-nodejs"
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -9950,7 +9950,7 @@
},
"vcpkg-tool-nodejs": {
"baseline": "16.18.0",
"port-version": 1
"port-version": 2
},
"vcpkg-tool-python2": {
"baseline": "2.7.18",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vcpkg-tool-nodejs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6d004b33aa9e92c31d1238728de1546712af44d0",
"version-semver": "16.18.0",
"port-version": 2
},
{
"git-tree": "2738f551c277a4ac6650e7d140fc36aa26210a63",
"version-semver": "16.18.0",
Expand Down
Loading