Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: upgrade npm to 2.9.0 (this time for v1.x) #1583

Merged
merged 3 commits into from
May 2, 2015

Conversation

othiym23
Copy link
Contributor

@othiym23 othiym23 commented May 1, 2015

Like #1573, but for v1.x. See #1573 for details. Floating patches applied, and this time I remembered to apply --whitespace=fix before pushing (is there a way to do that on initial commit, so I don't have to add a gratuitous rebase into the process?).

r: @Fishrock123
r: @chrisdickinson

@mscdex mscdex added the npm Issues and PRs related to the npm client dependency or the npm registry. label May 1, 2015
@Fishrock123
Copy link
Contributor

rubber-stamp lgtm

@Fishrock123
Copy link
Contributor

is there a way to do that on initial commit, so I don't have to add a gratuitous rebase into the process?

I think --whitespace=fix is an option for git commit?

@othiym23
Copy link
Contributor Author

othiym23 commented May 2, 2015

I think --whitespace=fix is an option for git commit?

Not according to the docs, and I don't think it worked last time I checked, but I'll play around with it some more. I think it's an option actually consumed by git apply, which is what rebasing, merging, and git am use, but not commit and checkout. Ah well.

othiym23 and others added 3 commits May 1, 2015 19:08
PR-URL: nodejs#1583
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Every npm version bump requires a few patches to be floated on
node-gyp for io.js compatibility. These patches are found in
03d1992,
5de334c, and
da730c7. This commit squashes
them into a single commit.

PR-URL: nodejs#990
Reviewed-By: Ben Noordhuis <[email protected]>
On Windows, when node or io.js attempts to dynamically load a compiled
addon, the compiled addon tries to load node.exe or iojs.exe again -
depending on which import library the module used when it was linked.
This causes many compiled addons to break when node.exe or iojs.exe are
renamed, because when the binary has been renamed the addon DLL can't
find the (right) .exe file to load its imports from.

This patch gives compiled addon developers an option to overcome this
restriction by compiling a delay-load hook into their binary. The
delay-load hook ensures that whenever a module tries to load imports
from node.exe/iojs.exe, it'll just look at the process image, thereby
making the addon work regardless of what name the node/iojs binary has.

To enable this feature, the addon developer must set the
'win_delay_load_hook' option to 'true' in their binding.gyp file, like
this:

```
{
  'targets': [
    {
      'target_name': 'ernie',
      'win_delay_load_hook': 'true',
      ...
```

Bug: nodejs#751
Bug: nodejs#965
Upstream PR: nodejs/node-gyp#599

PR-URL: nodejs#1251
Reviewed-By: Rod Vagg <[email protected]>

PR-URL: nodejs#1266
Reviewed-By: Ben Noordhuis <[email protected]>
@othiym23 othiym23 merged commit 0eb74a8 into nodejs:v1.x May 2, 2015
@othiym23 othiym23 deleted the npm-2.9.0-v1.x branch May 2, 2015 02:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
npm Issues and PRs related to the npm client dependency or the npm registry.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants