Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Barczewski <jeff.barczewski@gmail.com>2015-03-06 20:39:40 +0300
committerForrest L Norvell <forrest@npmjs.com>2015-03-12 23:24:47 +0300
commita91f2c7c9a5183d9cde7aae040ebd9ccdf104be7 (patch)
tree88b71871eb4a310e3373d818977450261c9d51e5 /node_modules/node-gyp
parent721b17a31690bec074eb8763d823d6de63406005 (diff)
node-gyp@1.0.3
Upgrade bundled node-gyp from v1.0.2 to v1.0.3 which fixes the warning ``` customFds option is deprecated, use stdio instead. ```
Diffstat (limited to 'node_modules/node-gyp')
-rw-r--r--node_modules/node-gyp/README.md13
-rw-r--r--node_modules/node-gyp/lib/build.js10
-rw-r--r--node_modules/node-gyp/lib/node-gyp.js4
-rw-r--r--node_modules/node-gyp/lib/rebuild.js2
-rw-r--r--node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json24
-rw-r--r--node_modules/node-gyp/node_modules/minimatch/package.json24
-rw-r--r--node_modules/node-gyp/package.json24
7 files changed, 35 insertions, 66 deletions
diff --git a/node_modules/node-gyp/README.md b/node_modules/node-gyp/README.md
index 8d2d49512..53d5da247 100644
--- a/node_modules/node-gyp/README.md
+++ b/node_modules/node-gyp/README.md
@@ -44,7 +44,7 @@ You will also need to install:
* If the install fails, try uninstalling any C++ 2010 x64&x86 Redistributable that you have installed first.
* If you get errors that the 64-bit compilers are not installed you may also need the [compiler update for the Windows SDK 7.1]
* Windows 7/8:
- * Microsoft Visual Studio C++ 2012 for Windows Desktop ([Express][msvc2012] version works well)
+ * Microsoft Visual Studio C++ 2012/13 for Windows Desktop ([Express][msvc2012] version works well)
If you have multiple Python versions installed, you can identify which Python
version `node-gyp` uses by setting the '--python' variable:
@@ -82,7 +82,7 @@ $ node-gyp configure
```
__Note__: The `configure` step looks for the `binding.gyp` file in the current
-directory to processs. See below for instructions on creating the `binding.gyp` file.
+directory to process. See below for instructions on creating the `binding.gyp` file.
Now you will have either a `Makefile` (on Unix platforms) or a `vcxproj` file
(on Windows) in the `build/` directory. Next invoke the `build` command:
@@ -96,7 +96,7 @@ in `build/Debug/` or `build/Release/`, depending on the build mode. At this poin
you can require the `.node` file with Node and run your tests!
__Note:__ To create a _Debug_ build of the bindings file, pass the `--debug` (or
-`-d`) switch when running the either `configure` or `build` command.
+`-d`) switch when running either the `configure`, `build` or `rebuild` command.
The "binding.gyp" file
@@ -120,8 +120,9 @@ A barebones `gyp` file appropriate for building a node addon looks like:
}
```
-Some additional resources for writing `gyp` files:
+Some additional resources for addons and writing `gyp` files:
+ * ["Going Native" a nodeschool.io tutorial](http://nodeschool.io/#goingnative)
* ["Hello World" node addon example](https://github.com/joyent/node/tree/master/test/addons/hello-world)
* [gyp user documentation](http://code.google.com/p/gyp/wiki/GypUserDocumentation)
* [gyp input format reference](http://code.google.com/p/gyp/wiki/InputFormatReference)
@@ -136,9 +137,9 @@ Commands
| **Command** | **Description**
|:--------------|:---------------------------------------------------------------
| `build` | Invokes `make`/`msbuild.exe` and builds the native addon
-| `clean` | Removes any the `build` dir if it exists
+| `clean` | Removes the `build` directory if it exists
| `configure` | Generates project build files for the current platform
-| `rebuild` | Runs "clean", "configure" and "build" all in a row
+| `rebuild` | Runs `clean`, `configure` and `build` all in a row
| `install` | Installs node development header files for the given version
| `list` | Lists the currently installed node development file versions
| `remove` | Removes the node development header files for the given version
diff --git a/node_modules/node-gyp/lib/build.js b/node_modules/node-gyp/lib/build.js
index f3605902e..df24aaf45 100644
--- a/node_modules/node-gyp/lib/build.js
+++ b/node_modules/node-gyp/lib/build.js
@@ -222,8 +222,9 @@ function build (gyp, argv, callback) {
var p = arch === 'x64' ? 'x64' : 'Win32'
argv.push('/p:Configuration=' + buildType + ';Platform=' + p)
if (jobs) {
- if (!isNaN(parseInt(jobs, 10))) {
- argv.push('/m:' + parseInt(jobs, 10))
+ var j = parseInt(jobs, 10)
+ if (!isNaN(j) && j > 0) {
+ argv.push('/m:' + j)
} else if (jobs.toUpperCase() === 'MAX') {
argv.push('/m:' + require('os').cpus().length)
}
@@ -234,9 +235,10 @@ function build (gyp, argv, callback) {
argv.push('-C')
argv.push('build')
if (jobs) {
- if (!isNaN(parseInt(jobs, 10))) {
+ var j = parseInt(jobs, 10)
+ if (!isNaN(j) && j > 0) {
argv.push('--jobs')
- argv.push(parseInt(jobs, 10))
+ argv.push(j)
} else if (jobs.toUpperCase() === 'MAX') {
argv.push('--jobs')
argv.push(require('os').cpus().length)
diff --git a/node_modules/node-gyp/lib/node-gyp.js b/node_modules/node-gyp/lib/node-gyp.js
index df7ce8555..6223d4b19 100644
--- a/node_modules/node-gyp/lib/node-gyp.js
+++ b/node_modules/node-gyp/lib/node-gyp.js
@@ -180,8 +180,8 @@ proto.parseArgv = function parseOpts (argv) {
proto.spawn = function spawn (command, args, opts) {
if (!opts) opts = {}
- if (!opts.silent && !opts.customFds) {
- opts.customFds = [ 0, 1, 2 ]
+ if (!opts.silent && !opts.stdio) {
+ opts.stdio = [ 0, 1, 2 ]
}
var cp = child_process.spawn(command, args, opts)
log.info('spawn', command)
diff --git a/node_modules/node-gyp/lib/rebuild.js b/node_modules/node-gyp/lib/rebuild.js
index 595d87a7d..497ffbd96 100644
--- a/node_modules/node-gyp/lib/rebuild.js
+++ b/node_modules/node-gyp/lib/rebuild.js
@@ -9,7 +9,7 @@ function rebuild (gyp, argv, callback) {
gyp.todo.push(
{ name: 'clean', args: [] }
- , { name: 'configure', args: [] }
+ , { name: 'configure', args: argv }
, { name: 'build', args: [] }
)
process.nextTick(callback)
diff --git a/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json b/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json
index bd516c297..94b64535f 100644
--- a/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json
+++ b/node_modules/node-gyp/node_modules/minimatch/node_modules/sigmund/package.json
@@ -32,27 +32,11 @@
},
"license": "BSD",
"readme": "# sigmund\n\nQuick and dirty signatures for Objects.\n\nThis is like a much faster `deepEquals` comparison, which returns a\nstring key suitable for caches and the like.\n\n## Usage\n\n```javascript\nfunction doSomething (someObj) {\n var key = sigmund(someObj, maxDepth) // max depth defaults to 10\n var cached = cache.get(key)\n if (cached) return cached)\n\n var result = expensiveCalculation(someObj)\n cache.set(key, result)\n return result\n}\n```\n\nThe resulting key will be as unique and reproducible as calling\n`JSON.stringify` or `util.inspect` on the object, but is much faster.\nIn order to achieve this speed, some differences are glossed over.\nFor example, the object `{0:'foo'}` will be treated identically to the\narray `['foo']`.\n\nAlso, just as there is no way to summon the soul from the scribblings\nof a cocain-addled psychoanalyst, there is no way to revive the object\nfrom the signature string that sigmund gives you. In fact, it's\nbarely even readable.\n\nAs with `sys.inspect` and `JSON.stringify`, larger objects will\nproduce larger signature strings.\n\nBecause sigmund is a bit less strict than the more thorough\nalternatives, the strings will be shorter, and also there is a\nslightly higher chance for collisions. For example, these objects\nhave the same signature:\n\n var obj1 = {a:'b',c:/def/,g:['h','i',{j:'',k:'l'}]}\n var obj2 = {a:'b',c:'/def/',g:['h','i','{jkl']}\n\nLike a good Freudian, sigmund is most effective when you already have\nsome understanding of what you're looking for. It can help you help\nyourself, but you must be willing to do some work as well.\n\nCycles are handled, and cyclical objects are silently omitted (though\nthe key is included in the signature output.)\n\nThe second argument is the maximum depth, which defaults to 10,\nbecause that is the maximum object traversal depth covered by most\ninsurance carriers.\n",
- "_id": "sigmund@1.0.0",
- "dist": {
- "shasum": "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296",
- "tarball": "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
- },
- "_npmVersion": "1.1.48",
- "_npmUser": {
- "name": "isaacs",
- "email": "i@izs.me"
- },
- "maintainers": [
- {
- "name": "isaacs",
- "email": "i@izs.me"
- }
- ],
- "_shasum": "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296",
- "_resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz",
- "_from": "sigmund@>=1.0.0 <1.1.0",
+ "readmeFilename": "README.md",
"bugs": {
"url": "https://github.com/isaacs/sigmund/issues"
},
- "homepage": "https://github.com/isaacs/sigmund"
+ "homepage": "https://github.com/isaacs/sigmund",
+ "_id": "sigmund@1.0.0",
+ "_from": "sigmund@>=1.0.0 <1.1.0"
}
diff --git a/node_modules/node-gyp/node_modules/minimatch/package.json b/node_modules/node-gyp/node_modules/minimatch/package.json
index 8bf46ccae..505767de8 100644
--- a/node_modules/node-gyp/node_modules/minimatch/package.json
+++ b/node_modules/node-gyp/node_modules/minimatch/package.json
@@ -29,30 +29,12 @@
"type": "MIT",
"url": "http://github.com/isaacs/minimatch/raw/master/LICENSE"
},
- "gitHead": "b374a643976eb55cdc19c60b6dd51ebe9bcc607a",
+ "readme": "# minimatch\n\nA minimal matching utility.\n\n[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)\n\n\nThis is the matching library used internally by npm.\n\nEventually, it will replace the C binding in node-glob.\n\nIt works by converting glob expressions into JavaScript `RegExp`\nobjects.\n\n## Usage\n\n```javascript\nvar minimatch = require(\"minimatch\")\n\nminimatch(\"bar.foo\", \"*.foo\") // true!\nminimatch(\"bar.foo\", \"*.bar\") // false!\nminimatch(\"bar.foo\", \"*.+(bar|foo)\", { debug: true }) // true, and noisy!\n```\n\n## Features\n\nSupports these glob features:\n\n* Brace Expansion\n* Extended glob matching\n* \"Globstar\" `**` matching\n\nSee:\n\n* `man sh`\n* `man bash`\n* `man 3 fnmatch`\n* `man 5 gitignore`\n\n## Minimatch Class\n\nCreate a minimatch object by instanting the `minimatch.Minimatch` class.\n\n```javascript\nvar Minimatch = require(\"minimatch\").Minimatch\nvar mm = new Minimatch(pattern, options)\n```\n\n### Properties\n\n* `pattern` The original pattern the minimatch object represents.\n* `options` The options supplied to the constructor.\n* `set` A 2-dimensional array of regexp or string expressions.\n Each row in the\n array corresponds to a brace-expanded pattern. Each item in the row\n corresponds to a single path-part. For example, the pattern\n `{a,b/c}/d` would expand to a set of patterns like:\n\n [ [ a, d ]\n , [ b, c, d ] ]\n\n If a portion of the pattern doesn't have any \"magic\" in it\n (that is, it's something like `\"foo\"` rather than `fo*o?`), then it\n will be left as a string rather than converted to a regular\n expression.\n\n* `regexp` Created by the `makeRe` method. A single regular expression\n expressing the entire pattern. This is useful in cases where you wish\n to use the pattern somewhat like `fnmatch(3)` with `FNM_PATH` enabled.\n* `negate` True if the pattern is negated.\n* `comment` True if the pattern is a comment.\n* `empty` True if the pattern is `\"\"`.\n\n### Methods\n\n* `makeRe` Generate the `regexp` member if necessary, and return it.\n Will return `false` if the pattern is invalid.\n* `match(fname)` Return true if the filename matches the pattern, or\n false otherwise.\n* `matchOne(fileArray, patternArray, partial)` Take a `/`-split\n filename, and match it against a single row in the `regExpSet`. This\n method is mainly for internal use, but is exposed so that it can be\n used by a glob-walker that needs to avoid excessive filesystem calls.\n\nAll other methods are internal, and will be called as necessary.\n\n## Functions\n\nThe top-level exported function has a `cache` property, which is an LRU\ncache set to store 100 items. So, calling these methods repeatedly\nwith the same pattern and options will use the same Minimatch object,\nsaving the cost of parsing it multiple times.\n\n### minimatch(path, pattern, options)\n\nMain export. Tests a path against the pattern using the options.\n\n```javascript\nvar isJS = minimatch(file, \"*.js\", { matchBase: true })\n```\n\n### minimatch.filter(pattern, options)\n\nReturns a function that tests its\nsupplied argument, suitable for use with `Array.filter`. Example:\n\n```javascript\nvar javascripts = fileList.filter(minimatch.filter(\"*.js\", {matchBase: true}))\n```\n\n### minimatch.match(list, pattern, options)\n\nMatch against the list of\nfiles, in the style of fnmatch or glob. If nothing is matched, and\noptions.nonull is set, then return a list containing the pattern itself.\n\n```javascript\nvar javascripts = minimatch.match(fileList, \"*.js\", {matchBase: true}))\n```\n\n### minimatch.makeRe(pattern, options)\n\nMake a regular expression object from the pattern.\n\n## Options\n\nAll options are `false` by default.\n\n### debug\n\nDump a ton of stuff to stderr.\n\n### nobrace\n\nDo not expand `{a,b}` and `{1..3}` brace sets.\n\n### noglobstar\n\nDisable `**` matching against multiple folder names.\n\n### dot\n\nAllow patterns to match filenames starting with a period, even if\nthe pattern does not explicitly have a period in that spot.\n\nNote that by default, `a/**/b` will **not** match `a/.d/b`, unless `dot`\nis set.\n\n### noext\n\nDisable \"extglob\" style patterns like `+(a|b)`.\n\n### nocase\n\nPerform a case-insensitive match.\n\n### nonull\n\nWhen a match is not found by `minimatch.match`, return a list containing\nthe pattern itself if this option is set. When not set, an empty list\nis returned if there are no matches.\n\n### matchBase\n\nIf set, then patterns without slashes will be matched\nagainst the basename of the path if it contains slashes. For example,\n`a?b` would match the path `/xyz/123/acb`, but not `/xyz/acb/123`.\n\n### nocomment\n\nSuppress the behavior of treating `#` at the start of a pattern as a\ncomment.\n\n### nonegate\n\nSuppress the behavior of treating a leading `!` character as negation.\n\n### flipNegate\n\nReturns from negate expressions the same as if they were not negated.\n(Ie, true on a hit, false on a miss.)\n\n\n## Comparisons to other fnmatch/glob implementations\n\nWhile strict compliance with the existing standards is a worthwhile\ngoal, some discrepancies exist between minimatch and other\nimplementations, and are intentional.\n\nIf the pattern starts with a `!` character, then it is negated. Set the\n`nonegate` flag to suppress this behavior, and treat leading `!`\ncharacters normally. This is perhaps relevant if you wish to start the\npattern with a negative extglob pattern like `!(a|B)`. Multiple `!`\ncharacters at the start of a pattern will negate the pattern multiple\ntimes.\n\nIf a pattern starts with `#`, then it is treated as a comment, and\nwill not match anything. Use `\\#` to match a literal `#` at the\nstart of a line, or set the `nocomment` flag to suppress this behavior.\n\nThe double-star character `**` is supported by default, unless the\n`noglobstar` flag is set. This is supported in the manner of bsdglob\nand bash 4.1, where `**` only has special significance if it is the only\nthing in a path part. That is, `a/**/b` will match `a/x/y/b`, but\n`a/**b` will not.\n\nIf an escaped pattern has no matches, and the `nonull` flag is set,\nthen minimatch.match returns the pattern as-provided, rather than\ninterpreting the character escapes. For example,\n`minimatch.match([], \"\\\\*a\\\\?\")` will return `\"\\\\*a\\\\?\"` rather than\n`\"*a?\"`. This is akin to setting the `nullglob` option in bash, except\nthat it does not resolve escaped pattern characters.\n\nIf brace expansion is not disabled, then it is performed before any\nother interpretation of the glob pattern. Thus, a pattern like\n`+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded\n**first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are\nchecked for validity. Since those two are valid, matching proceeds.\n",
+ "readmeFilename": "README.md",
"bugs": {
"url": "https://github.com/isaacs/minimatch/issues"
},
"homepage": "https://github.com/isaacs/minimatch",
"_id": "minimatch@1.0.0",
- "_shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
- "_from": "minimatch@>=1.0.0 <2.0.0",
- "_npmVersion": "1.4.21",
- "_npmUser": {
- "name": "isaacs",
- "email": "i@izs.me"
- },
- "maintainers": [
- {
- "name": "isaacs",
- "email": "i@izs.me"
- }
- ],
- "dist": {
- "shasum": "e0dd2120b49e1b724ce8d714c520822a9438576d",
- "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
- },
- "directories": {},
- "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
- "readme": "ERROR: No README data found!"
+ "_from": "minimatch@>=1.0.0 <2.0.0"
}
diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json
index be8cb8818..8b092ddca 100644
--- a/node_modules/node-gyp/package.json
+++ b/node_modules/node-gyp/package.json
@@ -10,7 +10,7 @@
"bindings",
"gyp"
],
- "version": "1.0.2",
+ "version": "1.0.3",
"installVersion": 9,
"author": {
"name": "Nathan Rajlich",
@@ -33,7 +33,7 @@
"minimatch": "1",
"mkdirp": "^0.5.0",
"nopt": "2 || 3",
- "npmlog": "0",
+ "npmlog": "0 || 1",
"osenv": "0",
"request": "2",
"rimraf": "2",
@@ -44,19 +44,19 @@
"engines": {
"node": ">= 0.8.0"
},
- "gitHead": "1e399b471945b35f3bfbca4a10fba31a6739b5db",
+ "gitHead": "abad2b58c03de713eb1805f7a681b1084c08b316",
"bugs": {
"url": "https://github.com/TooTallNate/node-gyp/issues"
},
"homepage": "https://github.com/TooTallNate/node-gyp",
- "_id": "node-gyp@1.0.2",
+ "_id": "node-gyp@1.0.3",
"scripts": {},
- "_shasum": "b0bb6d2d762271408dd904853e7aa3000ed2eb57",
- "_from": "node-gyp@>=1.0.2 <1.1.0",
- "_npmVersion": "2.0.0-beta.3",
+ "_shasum": "a2f63f2df0b1f6cc69fa54bce3cc298aa769cbd8",
+ "_from": "node-gyp@>=1.0.3 <1.1.0",
+ "_npmVersion": "1.4.28",
"_npmUser": {
- "name": "isaacs",
- "email": "i@izs.me"
+ "name": "tootallnate",
+ "email": "nathan@tootallnate.net"
},
"maintainers": [
{
@@ -73,10 +73,10 @@
}
],
"dist": {
- "shasum": "b0bb6d2d762271408dd904853e7aa3000ed2eb57",
- "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz"
+ "shasum": "a2f63f2df0b1f6cc69fa54bce3cc298aa769cbd8",
+ "tarball": "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.3.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz",
+ "_resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-1.0.3.tgz",
"readme": "ERROR: No README data found!"
}