[node-api] rework port #29743

Pospelove · 2023-02-19T21:08:03Z

rework port based on feedback from the upstream team: nodejs/node#46641 (comment)

works on my arm64-osx host, needs windows verification so WIP for now

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout a325228200d7f229f3337e612e0077f2a5307090 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 1b8f59b..ad81ba5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5433,8 +5433,8 @@
       "port-version": 0
     },
     "node-api": {
-      "baseline": "18.12.1",
-      "port-version": 2
+      "baseline": "8",
+      "port-version": 0
     },
     "nonius": {
       "baseline": "2019-04-20",
diff --git a/versions/n-/node-api.json b/versions/n-/node-api.json
index 0dd5dae..0504213 100644
--- a/versions/n-/node-api.json
+++ b/versions/n-/node-api.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fa75e515539e8e85bfa38689e5eb33852684faa5",
+      "version": "8",
+      "port-version": 0
+    },
     {
       "git-tree": "d127d3b83f2702e56542e7c90807893464f3de79",
       "version-semver": "18.12.1",

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout a325228200d7f229f3337e612e0077f2a5307090 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 1b8f59b..ad81ba5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5433,8 +5433,8 @@
       "port-version": 0
     },
     "node-api": {
-      "baseline": "18.12.1",
-      "port-version": 2
+      "baseline": "8",
+      "port-version": 0
     },
     "nonius": {
       "baseline": "2019-04-20",
diff --git a/versions/n-/node-api.json b/versions/n-/node-api.json
index 0dd5dae..d2b7751 100644
--- a/versions/n-/node-api.json
+++ b/versions/n-/node-api.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ce52d04028503b849e76861c8e591d054cb9aa9",
+      "version": "8",
+      "port-version": 0
+    },
     {
       "git-tree": "d127d3b83f2702e56542e7c90807893464f3de79",
       "version-semver": "18.12.1",

ports/node-api/vcpkg.json

dg0yt

Once we start using CMake properly, we could even export the CMake config. (But I don't want to ask for it now.)

ports/node-api/CMakeLists.txt

dg0yt · 2023-02-20T09:49:57Z

ports/node-api/CMakeLists.txt

+add_custom_target(nodelib_def ALL
+    COMMAND ${NODEJS_EXECUTABLE} ${CMAKE_SOURCE_DIR}/generateNodeLibDef.js
+    COMMENT "Generating .def file"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)


A rule to generate a particular file. This calls for add_custom_command, with an output file in CMAKE_BINARY_DIR.

I would still prefer to see this changed.

dg0yt · 2023-02-20T09:50:21Z

ports/node-api/CMakeLists.txt

+    COMMENT "Building node.lib"
+)
+
+add_dependencies(nodelib nodelib_def)


... and then this becomes obsolete.

ports/node-api/CMakeLists.txt

+
+add_dependencies(nodelib nodelib_def)
+
+install(FILES ${CMAKE_BINARY_DIR}/node.lib DESTINATION lib)


ports/node-api/portfile.cmake

ports/node-api/unofficial-node-api-config.cmake.in

Pospelove · 2023-02-20T20:47:01Z

@JonLiu1993 ready for review (now works on windows)

ports/node-api/CMakeLists.txt

dg0yt · 2023-02-21T04:32:01Z

ports/node-api/CMakeLists.txt

+add_custom_target(nodelib_def ALL
+    COMMAND ${NODEJS_EXECUTABLE} ${CMAKE_SOURCE_DIR}/generateNodeLibDef.js
+    COMMENT "Generating .def file"
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)


I would still prefer to see this changed.

ports/node-api/vcpkg.json

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for node-api have changed but the version was not updated
version: 8-19.6.0
old SHA: 7d2b9b2fe1b39626659d04bd190212c949a104db
new SHA: 2e6b838f0b5e60037187a0fe40e257a2b7b7d629
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Pospelove · 2023-02-21T13:16:13Z

@dg0yt @JonLiu1993 ready for review

ports/node-api/vcpkg.json

JonLiu1993 · 2023-04-13T07:26:31Z

@Pospelove, The upstream has given their suggestions for the version form of node-api-headers, you can refer to it.

Pospelove · 2023-04-13T09:08:03Z

@JonLiu1993 done

ports/node-api-headers/portfile.cmake

Co-authored-by: JonLiu1993 <[email protected]>

BillyONeal · 2023-04-13T19:20:12Z

Thanks for applying the versioning changes from upstream :)

BillyONeal · 2023-04-13T19:50:15Z

Thank you!

Pospelove added 3 commits February 20, 2023 02:59

wip

11e93e0

headers should download

adbfa50

fix config & remove commented lines

5f222d5

github-actions bot requested changes Feb 19, 2023

View reviewed changes

better license handling

0fb57e5

github-actions bot requested changes Feb 19, 2023

View reviewed changes

Pospelove added 2 commits February 20, 2023 03:56

support windows node.lib generation

ddd0665

addver

e585ecc

Pospelove changed the title ~~Node api mod~~ [node-api] rework port Feb 19, 2023

FrankXie05 assigned JonLiu1993 Feb 20, 2023

JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Feb 20, 2023

JonLiu1993 reviewed Feb 20, 2023

View reviewed changes

ports/node-api/vcpkg.json Outdated Show resolved Hide resolved

dg0yt reviewed Feb 20, 2023

View reviewed changes

Pospelove added 4 commits February 20, 2023 20:10

@dg0yt - minor fixes

d02c89f

ver

83b115d

now works on windows

ef6fd50

ver

8342150

Pospelove marked this pull request as ready for review February 20, 2023 20:45

Pospelove added 2 commits February 21, 2023 02:49

.

122cb3d

ver

12e121a

dg0yt reviewed Feb 21, 2023

View reviewed changes

Pospelove added 3 commits February 21, 2023 18:41

upd

a2653db

.

ed694ba

merge

6426ca0

github-actions bot previously requested changes Feb 21, 2023

View reviewed changes

.

e924493

dg0yt reviewed Feb 21, 2023

View reviewed changes

ports/node-api/vcpkg.json Outdated Show resolved Hide resolved

JonLiu1993 added the requires:author-response label Feb 22, 2023

JonLiu1993 added the requires:author-response label Apr 13, 2023

Update vcpkg.json

dcd0f2f

Pospelove dismissed JonLiu1993’s stale review via dcd0f2f April 13, 2023 09:02

Update portfile.cmake

9f2705c

JonLiu1993 removed the requires:author-response label Apr 13, 2023

Pospelove added 3 commits April 13, 2023 15:06

1

6f67a91

x

fb62c3d

remove 8+19.1.0 ver

cc3d30c

JonLiu1993 reviewed Apr 13, 2023

View reviewed changes

ports/node-api-headers/portfile.cmake Outdated Show resolved Hide resolved

JonLiu1993 added the requires:author-response label Apr 13, 2023

Pospelove and others added 2 commits April 13, 2023 16:19

Update ports/node-api-headers/portfile.cmake

1fdfe03

Co-authored-by: JonLiu1993 <[email protected]>

addver

9164abf

JonLiu1993 removed the requires:author-response label Apr 13, 2023

Pospelove added 6 commits April 13, 2023 16:21

updhash

311f8fa

.

9a37f10

brr go back

7f70e55

.

c449c61

.

4709420

fixver

6efee21

BillyONeal added info:reviewed Pull Request changes follow basic guidelines and removed depends:upstream-changes Waiting on a change to the upstream project labels Apr 13, 2023

BillyONeal added 2 commits April 13, 2023 12:21

Merge remote-tracking branch 'origin/master' into HEAD

36fc584

Remove phantom node-api version from the version DB.

a81ba56

BillyONeal approved these changes Apr 13, 2023

View reviewed changes

BillyONeal merged commit 78c1f5b into microsoft:master Apr 13, 2023

Pospelove deleted the node-api-mod branch April 14, 2023 05:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[node-api] rework port #29743

[node-api] rework port #29743

Pospelove commented Feb 19, 2023 •

edited

Loading

github-actions bot left a comment

github-actions bot left a comment

dg0yt left a comment

dg0yt Feb 20, 2023

dg0yt Feb 21, 2023

dg0yt Feb 20, 2023

This comment was marked as resolved.

Pospelove commented Feb 20, 2023 •

edited

Loading

dg0yt Feb 21, 2023

github-actions bot left a comment

Pospelove commented Feb 21, 2023

JonLiu1993 commented Apr 13, 2023

Pospelove commented Apr 13, 2023

BillyONeal commented Apr 13, 2023

BillyONeal commented Apr 13, 2023


		add_dependencies(nodelib nodelib_def)

		install(FILES ${CMAKE_BINARY_DIR}/node.lib DESTINATION lib)

[node-api] rework port #29743

[node-api] rework port #29743

Conversation

Pospelove commented Feb 19, 2023 • edited Loading

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

dg0yt left a comment

Choose a reason for hiding this comment

dg0yt Feb 20, 2023

Choose a reason for hiding this comment

dg0yt Feb 21, 2023

Choose a reason for hiding this comment

dg0yt Feb 20, 2023

Choose a reason for hiding this comment

This comment was marked as resolved.

Pospelove commented Feb 20, 2023 • edited Loading

dg0yt Feb 21, 2023

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

Pospelove commented Feb 21, 2023

JonLiu1993 commented Apr 13, 2023

Pospelove commented Apr 13, 2023

BillyONeal commented Apr 13, 2023

BillyONeal commented Apr 13, 2023

Pospelove commented Feb 19, 2023 •

edited

Loading

Pospelove commented Feb 20, 2023 •

edited

Loading