From: isaacs Date: Tue, 13 Mar 2012 04:10:40 +0000 (-0700) Subject: Upgrade npm to 1.1.6 X-Git-Tag: v0.7.6~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcb0cc0b184c61313541002e504948ed21f59dad;p=platform%2Fupstream%2Fnodejs.git Upgrade npm to 1.1.6 * Fix #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 #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 --- diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS index 86899d4..9a10b18 100644 --- a/deps/npm/AUTHORS +++ b/deps/npm/AUTHORS @@ -59,3 +59,4 @@ Rod Vagg Christian Howe Andrew Lunny Henrik Hodne +Adam Blackburn diff --git a/deps/npm/LICENSE b/deps/npm/LICENSE index 71ca385..c944259 100644 --- a/deps/npm/LICENSE +++ b/deps/npm/LICENSE @@ -1,4 +1,4 @@ -Copyright 2009, 2010, 2011 Isaac Z. Schlueter (the "Author") +Copyright 2009-2012, Isaac Z. Schlueter (the "Original Author") All rights reserved. MIT +no-false-attribs License @@ -20,9 +20,9 @@ by the recipients as they would use the unmodified Software, containing modifications that substantially alter, remove, or disable functionality of the Software, outside of the documented configuration mechanisms provided by the Software, shall be -modified such that the Author's bug reporting email addresses and -urls are either replaced with the contact information of the -parties responsible for the changes, or removed entirely. +modified such that the Original Author's bug reporting email +addresses and urls are either replaced with the contact information +of the parties responsible for the changes, or removed entirely. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES @@ -36,7 +36,7 @@ OTHER DEALINGS IN THE SOFTWARE. Except where noted, this license applies to any and all software programs and associated documentation files created by the -Author, when distributed with the Software. +Original Author, when distributed with the Software. "Node.js" and "node" trademark Joyent, Inc. npm is not officially part of the Node.js project, and is neither owned by nor @@ -49,13 +49,11 @@ and are not covered by this license. "npm Logo" created by Mathias Pettersson and Brian Hammond, used with permission. -This program includes a BSDTar/LibArchive version 2.8.3-1 binary, -originally distributed as part of the MinGW suite, compiled for -Win32, according to the terms of the BSD license. -See deps/basic-bsdtar-2.8.3-1-ming32-bin/basic-bsdtar.LICENSE. - This program uses "node-uuid", Copyright (c) 2010 Robert Kieffer, according to the terms of the MIT license. This program uses "request", Copyright (c) 2011 Mikeal Rogers, according to the terms of the Apache license. + +This program uses "mkdirp", Copyright (c) 2010 James Halliday, +according to the terms of the MIT/X11 license. diff --git a/deps/npm/bin/node-gyp-bin/node-gyp b/deps/npm/bin/node-gyp-bin/node-gyp new file mode 100644 index 0000000..345f07a --- /dev/null +++ b/deps/npm/bin/node-gyp-bin/node-gyp @@ -0,0 +1,2 @@ +#!/usr/bin/env sh +node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@" diff --git a/deps/npm/bin/node-gyp-bin/node-gyp.cmd b/deps/npm/bin/node-gyp-bin/node-gyp.cmd new file mode 100644 index 0000000..c2563ea --- /dev/null +++ b/deps/npm/bin/node-gyp-bin/node-gyp.cmd @@ -0,0 +1 @@ +node "%~dp0\..\..\node_modules\node-gyp\bin\node-gyp.js" %* diff --git a/deps/npm/bin/npm b/deps/npm/bin/npm old mode 100755 new mode 100644 diff --git a/deps/npm/bin/npm-cli.js b/deps/npm/bin/npm-cli.js old mode 100755 new mode 100644 diff --git a/deps/npm/bin/npm-get-uid-gid.js b/deps/npm/bin/npm-get-uid-gid.js old mode 100755 new mode 100644 diff --git a/deps/npm/bin/read-package-json.js b/deps/npm/bin/read-package-json.js old mode 100755 new mode 100644 diff --git a/deps/npm/cli.js b/deps/npm/cli.js old mode 100755 new mode 100644 diff --git a/deps/npm/configure b/deps/npm/configure old mode 100755 new mode 100644 diff --git a/deps/npm/doc/cli/json.md b/deps/npm/doc/cli/json.md index 0ded878..16b2ad9 100644 --- a/deps/npm/doc/cli/json.md +++ b/deps/npm/doc/cli/json.md @@ -428,7 +428,7 @@ node that your stuff works on: { "engines" : { "node" : ">=0.1.27 <0.1.30" } } And, like with dependencies, if you don't specify the version (or if you -specify "*" as the version), then any version of node will do. +specify "\*" as the version), then any version of node will do. If you specify an "engines" field, then npm will require that "node" be somewhere on that list. If "engines" is omitted, then npm will just assume @@ -439,6 +439,36 @@ are capable of properly installing your program. For example: { "engines" : { "npm" : "~1.0.20" } } +## os + +You can specify which operating systems your +module will run on: + + "os" : [ "darwin", "linux" ] + +You can also blacklist instead of whitelist operating systems, +just prepend the blacklisted os with a '!': + + "os" : [ "!win32" ] + +The host operating system is determined by `process.platform` + +It is allowed to both blacklist, and whitelist, although there isn't any +good reason to do this. + +## cpu + +If your code only runs on certain cpu architectures, +you can specify which ones. + + "cpu" : [ "x64", "ia32" ] + +Like the `os` option, you can also blacklist architectures: + + "cpu" : [ "!arm", "!mips" ] + +The host architecture is determined by `process.arch` + ## preferGlobal If your package is primarily a command-line application that should be diff --git a/deps/npm/html/api/GubbleBum-Blocky.ttf b/deps/npm/html/api/GubbleBum-Blocky.ttf old mode 100755 new mode 100644 diff --git a/deps/npm/html/api/bin.html b/deps/npm/html/api/bin.html index e805697..7a35f53 100644 --- a/deps/npm/html/api/bin.html +++ b/deps/npm/html/api/bin.html @@ -19,7 +19,7 @@

This function should not be used programmatically. Instead, just refer to the npm.bin member.

- +