Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote branch 'origin/v0.6'
Conflicts:
	deps/uv/src/win/util.c
	src/udp_wrap.cc
  • Loading branch information
ry committed Jan 16, 2012
2 parents 7584225 + 2541009 commit ca2a047
Show file tree
Hide file tree
Showing 148 changed files with 1,951 additions and 837 deletions.
60 changes: 0 additions & 60 deletions deps/npm/.gitmodules

This file was deleted.

1 change: 1 addition & 0 deletions deps/npm/.npmignore
Expand Up @@ -10,3 +10,4 @@ node_modules/.bin
npm-debug.log
./npmrc
.gitignore
release/
3 changes: 3 additions & 0 deletions deps/npm/AUTHORS
Expand Up @@ -48,3 +48,6 @@ Jameson Little <t.jameson.little@gmail.com>
cspotcode <cspotcode@gmail.com>
Maciej Małecki <maciej.malecki@notimplemented.org>
Stephen Sugden <glurgle@gmail.com>
Gautham Pai <buzypi@gmail.com>
David Trejo <david.daniel.trejo@gmail.com>
Paul Vorbach <paul@vorb.de>
20 changes: 9 additions & 11 deletions deps/npm/Makefile
Expand Up @@ -27,12 +27,9 @@ mandocs = $(api_mandocs) $(cli_mandocs)

htmldocs = $(api_htmldocs) $(cli_htmldocs)

all: submodules doc
all: doc

submodules:
! [ -d .git ] || git submodule update --init --recursive

latest: submodules
latest:
@echo "Installing latest published npm"
@echo "Use 'make install' or 'make link' to install the code"
@echo "in this folder that you're looking at right now."
Expand All @@ -51,7 +48,7 @@ clean: doc-clean uninstall
rm npmrc
node cli.js cache clean

uninstall: submodules
uninstall:
node cli.js rm npm -g -f

doc: $(mandocs) $(htmldocs)
Expand Down Expand Up @@ -94,24 +91,25 @@ html/api/%.html: doc/api/%.md html/dochead.html html/docfoot.html scripts/doc-bu
doc/cli/index.md: $(markdowns) scripts/index-build.js scripts/doc-build.sh package.json
node scripts/index-build.js > $@

node_modules/ronn:
node_modules/.bin/ronn:
node cli.js install https://github.com/isaacs/ronnjs/tarball/master

doc: man

man: $(cli_docs) $(api_docs)

test: submodules
test:
node cli.js test

version: link
git add package.json &&\
git ci -m v$(shell npm -v)

publish: link doc
git tag -d v$(shell npm -v) || true
git push origin :v$(shell npm -v) || true
npm unpublish npm@$(shell npm -v) || true
@git tag -d v$(shell npm -v) || true
@git push origin :v$(shell npm -v) || true
@npm unpublish npm@$(shell npm -v) || true
git clean -fd
git tag -s -m v$(shell npm -v) v$(shell npm -v) &&\
git push origin --tags &&\
npm publish &&\
Expand Down
6 changes: 6 additions & 0 deletions deps/npm/bin/npm
@@ -0,0 +1,6 @@
#!/bin/sh
if [ -x "`dirname "$0"`/node.exe" ]; then
"`dirname "$0"`/node.exe" "`dirname "$0"`/node_modules/npm/bin/npm-cli.js" "$@"
else
node "`dirname "$0"`/node_modules/npm/bin/npm-cli.js" "$@"
fi
6 changes: 0 additions & 6 deletions deps/npm/bin/npm-g.cmd

This file was deleted.

6 changes: 0 additions & 6 deletions deps/npm/bin/npm_g.cmd

This file was deleted.

10 changes: 10 additions & 0 deletions deps/npm/doc/cli/config.md
Expand Up @@ -101,6 +101,7 @@ The following shorthands are parsed on the command-line:
* `-v`: `--version`
* `-h`, `-?`, `--help`, `-H`: `--usage`
* `-s`, `--silent`: `--loglevel silent`
* `-q`, `--quiet`: `--loglevel warn`
* `-d`: `--loglevel info`
* `-dd`, `--verbose`: `--loglevel verbose`
* `-ddd`: `--loglevel silly`
Expand Down Expand Up @@ -278,6 +279,15 @@ Makes various commands more forceful.
* skips cache when requesting from the registry.
* prevents checks against clobbering non-npm files.

### git

* Default: `"git"`
* Type: String

The command to use for git commands. If git is installed on the
computer, but is not in the `PATH`, then set this to the full path to
the git binary.

### global

* Default: false
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/bin.html
Expand Up @@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This function should not be used programmatically. Instead, just refer
to the <code>npm.bin</code> member.</p>
</div>
<p id="footer">bin &mdash; npm@1.1.0-beta-10</p>
<p id="footer">bin &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/bugs.html
Expand Up @@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This command will launch a browser, so this command may not be the most
friendly for programmatic use.</p>
</div>
<p id="footer">bugs &mdash; npm@1.1.0-beta-10</p>
<p id="footer">bugs &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/commands.html
Expand Up @@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>

<ul><li><a href="../doc/index.html">index(1)</a></li></ul>
</div>
<p id="footer">commands &mdash; npm@1.1.0-beta-10</p>
<p id="footer">commands &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/config.html
Expand Up @@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>

<ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
</div>
<p id="footer">config &mdash; npm@1.1.0-beta-10</p>
<p id="footer">config &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/deprecate.html
Expand Up @@ -30,7 +30,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>

<ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../api/unpublish.html">unpublish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
</div>
<p id="footer">deprecate &mdash; npm@1.1.0-beta-10</p>
<p id="footer">deprecate &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/docs.html
Expand Up @@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>This command will launch a browser, so this command may not be the most
friendly for programmatic use.</p>
</div>
<p id="footer">docs &mdash; npm@1.1.0-beta-10</p>
<p id="footer">docs &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/edit.html
Expand Up @@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Since this command opens an editor in a new process, be careful about where
and how this is used.</p>
</div>
<p id="footer">edit &mdash; npm@1.1.0-beta-10</p>
<p id="footer">edit &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/explore.html
Expand Up @@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>

<p>The first element in the 'args' parameter must be a package name. After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
</div>
<p id="footer">explore &mdash; npm@1.1.0-beta-10</p>
<p id="footer">explore &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/help-search.html
Expand Up @@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>

<p>The silent parameter is not neccessary not used, but it may in the future.</p>
</div>
<p id="footer">help-search &mdash; npm@1.1.0-beta-10</p>
<p id="footer">help-search &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/init.html
Expand Up @@ -35,7 +35,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>

<p><a href="../doc/json.html">json(1)</a></p>
</div>
<p id="footer">init &mdash; npm@1.1.0-beta-10</p>
<p id="footer">init &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/install.html
Expand Up @@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Finally, 'callback' is a function that will be called when all packages have been
installed or when an error has been encountered.</p>
</div>
<p id="footer">install &mdash; npm@1.1.0-beta-10</p>
<p id="footer">install &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/link.html
Expand Up @@ -39,7 +39,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Now, any changes to the redis package will be reflected in
the package in the current working directory</p>
</div>
<p id="footer">link &mdash; npm@1.1.0-beta-10</p>
<p id="footer">link &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/load.html
Expand Up @@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>

<p>For a list of all the available command-line configs, see <code>npm help config</code></p>
</div>
<p id="footer">load &mdash; npm@1.1.0-beta-10</p>
<p id="footer">load &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/ls.html
Expand Up @@ -53,7 +53,7 @@ <h3 id="global">global</h3>
This means that if a submodule a same dependency as a parent module, then the
dependency will only be output once.</p>
</div>
<p id="footer">ls &mdash; npm@1.1.0-beta-10</p>
<p id="footer">ls &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
4 changes: 2 additions & 2 deletions deps/npm/html/api/npm.html
Expand Up @@ -24,7 +24,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>

<h2 id="VERSION">VERSION</h2>

<p>1.1.0-beta-10</p>
<p>1.1.0-2</p>

<h2 id="DESCRIPTION">DESCRIPTION</h2>

Expand Down Expand Up @@ -91,7 +91,7 @@ <h2 id="ABBREVS">ABBREVS</h2>

<pre><code>var cmd = npm.deref("unp") // cmd === "unpublish"</code></pre>
</div>
<p id="footer">npm &mdash; npm@1.1.0-beta-10</p>
<p id="footer">npm &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/outdated.html
Expand Up @@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>

<p>If the 'packages' parameter is left out, npm will check all packages.</p>
</div>
<p id="footer">outdated &mdash; npm@1.1.0-beta-10</p>
<p id="footer">outdated &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/owner.html
Expand Up @@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>

<ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
</div>
<p id="footer">owner &mdash; npm@1.1.0-beta-10</p>
<p id="footer">owner &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/pack.html
Expand Up @@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>

<p>If no arguments are supplied, then npm packs the current package folder.</p>
</div>
<p id="footer">pack &mdash; npm@1.1.0-beta-10</p>
<p id="footer">pack &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/prefix.html
Expand Up @@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>

<p>This function is not useful programmatically</p>
</div>
<p id="footer">prefix &mdash; npm@1.1.0-beta-10</p>
<p id="footer">prefix &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/prune.html
Expand Up @@ -23,7 +23,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p>Extraneous packages are packages that are not listed on the parent
package's dependencies list.</p>
</div>
<p id="footer">prune &mdash; npm@1.1.0-beta-10</p>
<p id="footer">prune &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/publish.html
Expand Up @@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>

<ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../api/owner.html">owner(3)</a></li></ul>
</div>
<p id="footer">publish &mdash; npm@1.1.0-beta-10</p>
<p id="footer">publish &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/rebuild.html
Expand Up @@ -22,7 +22,7 @@ <h2 id="CONFIGURATION">CONFIGURATION</h2>

<p>See <code>npm help build</code></p>
</div>
<p id="footer">rebuild &mdash; npm@1.1.0-beta-10</p>
<p id="footer">rebuild &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/restart.html
Expand Up @@ -27,7 +27,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>

<ul><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
</div>
<p id="footer">restart &mdash; npm@1.1.0-beta-10</p>
<p id="footer">restart &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down
2 changes: 1 addition & 1 deletion deps/npm/html/api/root.html
Expand Up @@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>

<p>This function is not useful programmatically.</p>
</div>
<p id="footer">root &mdash; npm@1.1.0-beta-10</p>
<p id="footer">root &mdash; npm@1.1.0-2</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Expand Down

0 comments on commit ca2a047

Please sign in to comment.