Skip to content

Commit bcb0cc0

Browse files
isaacsisaacs
committed
Upgrade npm to 1.1.6
* Fix nodejs#472 Adds support for os/cpu fields in package.json (Adam Blackburn) * Don't use existing pkg if explicit * Install missing deps, even if they are in bundleDependencies * bundle node-gyp * Automatically node-gyp build stuff with a bindings.gyp * Fix nodejs#2230 Unpack in place. No folder renaming malarky * Never create un-listable directories * Fix cases where an optionalDependency fails to build * Always ignore .wafpickle-7 files * fix shrinkwrap test * Fix: bundleDependencies being re-installed unnecessarily
1 parent 9701f1c commit bcb0cc0

234 files changed

Lines changed: 27247 additions & 307 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deps/npm/AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ Rod Vagg <rod@vagg.org>
5959
Christian Howe <coderarity@gmail.com>
6060
Andrew Lunny <alunny@gmail.com>
6161
Henrik Hodne <dvyjones@binaryhex.com>
62+
Adam Blackburn <regality@gmail.com>

‎deps/npm/LICENSE‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2009, 2010, 2011 Isaac Z. Schlueter (the "Author")
1+
Copyright 2009-2012, Isaac Z. Schlueter (the "Original Author")
22
All rights reserved.
33

44
MIT +no-false-attribs License
@@ -20,9 +20,9 @@ by the recipients as they would use the unmodified Software,
2020
containing modifications that substantially alter, remove, or
2121
disable functionality of the Software, outside of the documented
2222
configuration mechanisms provided by the Software, shall be
23-
modified such that the Author's bug reporting email addresses and
24-
urls are either replaced with the contact information of the
25-
parties responsible for the changes, or removed entirely.
23+
modified such that the Original Author's bug reporting email
24+
addresses and urls are either replaced with the contact information
25+
of the parties responsible for the changes, or removed entirely.
2626

2727
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
2828
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
@@ -36,7 +36,7 @@ OTHER DEALINGS IN THE SOFTWARE.
3636

3737
Except where noted, this license applies to any and all software
3838
programs and associated documentation files created by the
39-
Author, when distributed with the Software.
39+
Original Author, when distributed with the Software.
4040

4141
"Node.js" and "node" trademark Joyent, Inc. npm is not officially
4242
part of the Node.js project, and is neither owned by nor
@@ -49,13 +49,11 @@ and are not covered by this license.
4949
"npm Logo" created by Mathias Pettersson and Brian Hammond,
5050
used with permission.
5151

52-
This program includes a BSDTar/LibArchive version 2.8.3-1 binary,
53-
originally distributed as part of the MinGW suite, compiled for
54-
Win32, according to the terms of the BSD license.
55-
See deps/basic-bsdtar-2.8.3-1-ming32-bin/basic-bsdtar.LICENSE.
56-
5752
This program uses "node-uuid", Copyright (c) 2010 Robert Kieffer,
5853
according to the terms of the MIT license.
5954

6055
This program uses "request", Copyright (c) 2011 Mikeal Rogers,
6156
according to the terms of the Apache license.
57+
58+
This program uses "mkdirp", Copyright (c) 2010 James Halliday,
59+
according to the terms of the MIT/X11 license.

‎deps/npm/bin/node-gyp-bin/node-gyp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env sh
2+
node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@"

‎deps/npm/bin/node-gyp-bin/node-gyp.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %*

‎deps/npm/bin/npm‎

100755100644
File mode changed.

‎deps/npm/bin/npm-cli.js‎

100755100644
File mode changed.

‎deps/npm/bin/npm-get-uid-gid.js‎

100755100644
File mode changed.

‎deps/npm/bin/read-package-json.js‎

100755100644
File mode changed.

‎deps/npm/cli.js‎

100755100644
File mode changed.

‎deps/npm/configure‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)