FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

build: add node_module_version to config.gypi by saper · Pull Request #8027 · nodejs/node · GitHub

/ node Public

build: add node_module_version to config.gypi - #8027

Closed
saper wants to merge 3 commits into
nodejs:v0.12-stagingfrom
saper:node_module_vesion/v0.12
ConversationCommits (3)ChecksFiles changed
Closed

build: add node_module_version to config.gypi#8027
saper wants to merge 3 commits into
nodejs:v0.12-stagingfrom
saper:node_module_vesion/v0.12

Conversation

saper commented Aug 8, 2016

Copy link
Copy Markdown

Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: nodejs/node-gyp#855

bnoordhuis added 2 commits May 25, 2016 09:07
build: turn on -fno-delete-null-pointer-checks
fc6d820 
Work around spec violations in V8 where it checks that `this == NULL`.
GCC 6 started exploiting this particular kind of UB, resulting in
runtime crashes.

Fixes: nodejs#6724
PR-URL: nodejs#6737
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
test: fix test failure due to expired certificates
a14d5ae 
Back-port commit 76f40f7 ("test: stronger crypto in test fixtures") from
the master branch.

Pushes back the expiration date of test/fixtures/keys/ca2-crl.pem to
2018, fixing a CRL_HAS_EXPIRED error in simple/test-tls-server-verify.

Fixes: nodejs#7194
PR-URL: nodejs#7195
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
nodejs-github-bot added the build Issues and PRs related to build files or the CI. label Aug 8, 2016
addaleax added the v0.12 label Aug 8, 2016

saper commented Aug 8, 2016

Copy link
Copy Markdown
Author

This is #7808 for v0.12

saper force-pushed the node_module_vesion/v0.12 branch 2 times, most recently from 3bda6d3 to aab8896 Compare August 8, 2016 23:50

mscdex commented Aug 9, 2016 •
edited
Loading

Copy link
Copy Markdown
Contributor

I believe PRs need to target the relevant -staging branch when applying to a version branch.

MylesBorins commented Aug 9, 2016

Copy link
Copy Markdown
Contributor

I believe that after today's LTS discussion it was decided that this would land in v4.x but we were not planning to backport to v0.10 or v0.12

/cc @nodejs/lts @rvagg

saper commented Aug 9, 2016

Copy link
Copy Markdown
Author

@mscdex I was checking git branch -rvv yesterday and I got lost a bit. There are also so many 5.x branches, some of them are ahead of 5.x. Is there any doc about it?

of course I am more than happy to cherry pick this somewhere else.

mscdex commented Aug 9, 2016 •
edited
Loading

Copy link
Copy Markdown
Contributor

@saper Perhaps you're looking at old release branches? Each major version (including v0.10 and v0.12) has its own -staging (e.g. v4.x-staging) branch where new commits go to get merged into the major version branch (e.g. v4.x), which is where new releases get cut from for that line.

saper commented Aug 9, 2016

Copy link
Copy Markdown
Author

Most probably, yes. Will try to fix that, thanks for pointing that out.

bnoordhuis commented Aug 9, 2016

Copy link
Copy Markdown
Member

I believe that after today's LTS discussion it was decided that this would land in v4.x but we were not planning to backport to v0.10 or v0.12

Can you reconsider? This change makes it possible for add-on authors to detect the ABI version without gross v0.10/v0.12-specific hacks in their binding.gyp.

jasnell commented Aug 9, 2016

Copy link
Copy Markdown
Member

Yeah, I don't think anyone felt that strongly about not having it, it was just more a bias towards leaving it as is since both are coming up to end-of-life soon. If there's a good enough justification then why not? :-)

saper mentioned this pull request Aug 17, 2016
Closed
saper changed the title build: Provide 'node_module_version' via config.gypi build: add node_module_version to config.gypi Aug 18, 2016
saper force-pushed the node_module_vesion/v0.12 branch from aab8896 to 468527f Compare August 18, 2016 21:58
saper mentioned this pull request Aug 18, 2016
Closed
saper changed the base branch from v0.12 to v0.12-staging August 18, 2016 22:18
saper force-pushed the node_module_vesion/v0.12 branch from 468527f to 0583134 Compare August 18, 2016 22:19
build: add node_module_version to config.gypi
addfeaa 
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on nodejs/node@410296c37

PR-URL: nodejs#8027
Ref: nodejs#7808
Ref: nodejs/node-gyp#855
saper force-pushed the node_module_vesion/v0.12 branch from 0583134 to addfeaa Compare August 18, 2016 22:40
saper added a commit to saper/node that referenced this pull request Aug 19, 2016
build: add node_module_version to config.gypi
7b8b8d4 
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on nodejs/node@410296c37

PR-URL: nodejs#8171
Ref: nodejs#8027
Ref: nodejs#7808
Ref: nodejs/node-gyp#855
jasnell pushed a commit that referenced this pull request Aug 22, 2016
build: add node_module_version to config.gypi
a0a1de1 
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: #8171
Ref: #8027
Ref: #7808
Ref: nodejs/node-gyp#855
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
MylesBorins pushed a commit that referenced this pull request Sep 28, 2016
build: add node_module_version to config.gypi
0ce75ff 
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: #8171
Ref: #8027
Ref: #7808
Ref: nodejs/node-gyp#855
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>

bnoordhuis commented Oct 7, 2016

Copy link
Copy Markdown
Member

@nodejs/lts Is this still on track for inclusion in a v0.12 release?

jasnell commented Oct 7, 2016

Copy link
Copy Markdown
Member

LGTM with green CI. Once it lands in v0.12-staging it should go out with whatever the next v0.12 release happens to be.

rvagg pushed a commit that referenced this pull request Oct 18, 2016
build: add node_module_version to config.gypi
6a55013 
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: #8171
Ref: #8027
Ref: #7808
Ref: nodejs/node-gyp#855
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
MylesBorins pushed a commit that referenced this pull request Oct 26, 2016
build: add node_module_version to config.gypi
c41efe4 
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on 410296c37

PR-URL: #8171
Ref: #8027
Ref: #7808
Ref: nodejs/node-gyp#855
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
richardlau mentioned this pull request Dec 20, 2016
Merged

rvagg commented Dec 20, 2016

Copy link
Copy Markdown
Member

not gonna make it sorry

rvagg closed this Dec 20, 2016

bnoordhuis commented Dec 20, 2016

Copy link
Copy Markdown
Member

@rvagg I think this is still good to go, it just needs a rebase. I can file a rebased PR if you want.

saper added a commit to saper/node that referenced this pull request Dec 20, 2016
build: add node_module_version to config.gypi
2ca95d6 
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on nodejs/node@410296c37

PR-URL: nodejs#8027
Ref: nodejs#7808
Ref: nodejs/node-gyp#855

saper commented Dec 20, 2016

Copy link
Copy Markdown
Author

I have pushed the rebase to the branch, there were no conflicts.

bnoordhuis pushed a commit to bnoordhuis/io.js that referenced this pull request Dec 20, 2016
build: add node_module_version to config.gypi
91a82bf 
Enable targetting of a different node version than
the currently running one when building binary modules.

Based on nodejs/node@410296c37

PR-URL: nodejs#8027
Ref: nodejs#7808
Ref: nodejs/node-gyp#855
bnoordhuis mentioned this pull request Dec 20, 2016
Closed

bnoordhuis commented Dec 20, 2016

Copy link
Copy Markdown
Member

This PR still seems to contain unrelated changes. I've opened #10355 as a cherry-pick of your commit on top of v0.12-staging.

saper commented Dec 20, 2016

Copy link
Copy Markdown
Author

thanks, @bnoordhuis ! I appreciate that.

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

build Issues and PRs related to build files or the CI.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

Back | FazBrowse Home | New Git URL