Skip to content

Commit b488be1

Browse files
committed
Include NPM, update .pkg to install it.
.msi update coming soon.
1 parent 05de01d commit b488be1

File tree

449 files changed

+33131
-4
lines changed

Some content is hidden

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

449 files changed

+33131
-4
lines changed

LICENSE

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,9 @@ The externally maintained libraries used by Node are:
7878
- deps/zlib copyright 1995-2010 Jean-loup Gailly and Mark Adler
7979
licensed under a permissive free software license. See
8080
deps/zlib/LICENSE.
81+
82+
- deps/npm NPM is a package manager program copyright 2009, 2010, 2011
83+
Isaac Z. Schlueter and licensed under MIT. NPM includes several
84+
subpackages MIT or Apache licenses, see deps/npm/LICENSE for more
85+
information. NPM is included in the Node .msi and .pkg distributions
86+
but not in the Node binary itself.

deps/npm/.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
*.swp
2+
test/bin
3+
test/output.log
4+
test/packages/*/node_modules
5+
test/packages/npm-test-depends-on-spark/which-spark.log
6+
test/packages/test-package/random-data.txt
7+
test/root
8+
node_modules/ronn
9+
node_modules/.bin
10+
npm-debug.log
11+
html/api/*.html
12+
html/doc/*.html
13+
man/
14+
doc/*/index.md
15+
./npmrc

deps/npm/.gitmodules

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
[submodule "node_modules/semver"]
2+
path = node_modules/semver
3+
url = https://github.com/isaacs/node-semver.git
4+
[submodule "node_modules/abbrev"]
5+
path = node_modules/abbrev
6+
url = https://github.com/isaacs/abbrev-js.git
7+
[submodule "node_modules/nopt"]
8+
path = node_modules/nopt
9+
url = https://github.com/isaacs/nopt.git
10+
[submodule "node_modules/node-uuid"]
11+
path = node_modules/node-uuid
12+
url = https://github.com/broofa/node-uuid
13+
[submodule "node_modules/minimatch"]
14+
path = node_modules/minimatch
15+
url = https://github.com/isaacs/minimatch.git
16+
[submodule "node_modules/graceful-fs"]
17+
path = node_modules/graceful-fs
18+
url = https://github.com/isaacs/node-graceful-fs.git
19+
[submodule "node_modules/slide"]
20+
path = node_modules/slide
21+
url = https://github.com/isaacs/slide-flow-control.git
22+
[submodule "node_modules/rimraf"]
23+
path = node_modules/rimraf
24+
url = https://github.com/isaacs/rimraf.git
25+
[submodule "node_modules/proto-list"]
26+
path = node_modules/proto-list
27+
url = https://github.com/isaacs/proto-list.git
28+
[submodule "node_modules/ini"]
29+
path = node_modules/ini
30+
url = https://github.com/isaacs/ini.git
31+
[submodule "node_modules/which"]
32+
path = node_modules/which
33+
url = https://github.com/isaacs/node-which.git
34+
[submodule "node_modules/request"]
35+
path = node_modules/request
36+
url = https://github.com/isaacs/request.git
37+
[submodule "node_modules/tar"]
38+
path = node_modules/tar
39+
url = git://github.com/isaacs/node-tar.git
40+
[submodule "node_modules/fstream"]
41+
path = node_modules/fstream
42+
url = git://github.com/isaacs/fstream.git
43+
[submodule "node_modules/inherits"]
44+
path = node_modules/inherits
45+
url = git://github.com/isaacs/inherits.git
46+
[submodule "node_modules/block-stream"]
47+
path = node_modules/block-stream
48+
url = git://github.com/isaacs/block-stream.git
49+
[submodule "node_modules/mkdirp"]
50+
path = node_modules/mkdirp
51+
url = git://github.com/isaacs/node-mkdirp.git

deps/npm/.npmignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
*.swp
2+
test/bin
3+
test/output.log
4+
test/packages/*/node_modules
5+
test/packages/npm-test-depends-on-spark/which-spark.log
6+
test/packages/test-package/random-data.txt
7+
test/root
8+
node_modules/ronn
9+
node_modules/.bin
10+
npm-debug.log
11+
./npmrc

deps/npm/AUTHORS

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Authors sorted by whether or not they're me
2+
Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)
3+
Steve Steiner <ssteinerX@gmail.com> (http://websaucesoftware.com/blog/)
4+
Mikeal Rogers <mikeal.rogers@gmail.com> (http://www.mikealrogers.com/)
5+
Aaron Blohowiak <aaron.blohowiak@gmail.com> (http://aaronblohowiak.com/)
6+
Martyn Smith <martyn@dollyfish.net.nz> (http://dollyfish.net.nz/)
7+
Mathias Pettersson <mape@mape.me> (http://mape.me/)
8+
Brian Hammond <brian@fictorial.com> (http://fictorial.com/)
9+
Charlie Robbins <charlie.robbins@gmail.com> (http://www.charlierobbins.com/)
10+
Francisco Treacy <francisco.treacy@gmail.com> (http://franciscotreacy.com/)
11+
Cliffano Subagio <cliffano@gmail.com> (http://blog.cliffano.com/)
12+
Christian Eager <christian.eager@nokia.com> (http://perpenduum.com)
13+
Dav Glass <davglass@gmail.com> (http://blog.davglass.com)
14+
Alex K. Wolfe <alexkwolfe@gmail.com>
15+
James Sanders <jimmyjazz14@gmail.com> (http://james-sanders.com/)
16+
Reid Burke <me@reidburke.com> (http://reidburke.com/)
17+
Arlo Breault <arlolra@gmail.com> (http://thoughtherder.com/)
18+
Timo Derstappen <teemow@gmail.com> (http://teemow.com)
19+
Bradley Meck <bradley.meck@gmail.com>
20+
Bart Teeuwisse <bart.teeuwisse@thecodemill.biz> (http://thecodemill.biz/)
21+
Ben Noordhuis <info@bnoordhuis.nl> (http://bnoordhuis.nl/)
22+
Tor Valamo <tor.valamo@gmail.com> (http://www.magnimedia.no/)
23+
Whyme.Lyu <5longluna@gmail.com> (http://whyme.kuantu.com/)
24+
Olivier Melcher <olivier.melcher@gmail.com>
25+
Tomaž Muraus <kami@k5-storitve.net> (http://www.tomaz-muraus.info)
26+
Evan Meagher <evan.meagher@gmail.com> (http://evanmeagher.net/)
27+
Orlando Vazquez <ovazquez@gmail.com> (http://2wycked.net/)
28+
George Miroshnykov <gmiroshnykov@lohika.com>
29+
Geoff Flarity (http://ca.linkedin.com/pub/geoff-flarity/a/536/43a)
30+
Pete Kruckenberg <pete@kruckenberg.com>
31+
Laurie Harper <laurie@holoweb.net> (http://laurie.holoweb.net/)
32+
Chris Wong <chris@chriswongstudio.com>
33+
Max Goodman <c@chromacode.com> (http://chromacode.com/)
34+
Scott Bronson <brons_github@rinspin.com>
35+
Federico Romero <federomero@gmail.com>
36+
Visnu Pitiyanuvath <visnupx@gmail.com> (http://visnup.com)
37+
Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com/)
38+
Mark Cahill <mark@tiemonster.info> (http://www.tiemonster.info/)
39+
Zearin <zearin@gonk.net>
40+
Iain Sproat <iainsproat@gmail.com>
41+
Trent Mick <trentm@gmail.com> (http://trentm.com/)
42+
Felix Geisendörfer <felix@debuggable.com> (http://www.debuggable.com/)
43+
Conny Brunnkvist <cbrunnkvist@gmail.com> (http://twitter.com/connyb)
44+
Will Elwood <w.elwood08@gmail.com> (https://github.com/welwood08)
45+
Oleg Efimov <efimovov@gmail.com> (http://sannis.ru)
46+
Martin Cooper <mfncooper@gmail.com>
47+
Jameson Little <t.jameson.little@gmail.com>
48+
cspotcode <cspotcode@gmail.com>
49+
Maciej Małecki <maciej.malecki@notimplemented.org>
50+
Stephen Sugden <glurgle@gmail.com>

deps/npm/CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
doc/cli/changelog.md

deps/npm/LICENSE

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
Copyright 2009, 2010, 2011 Isaac Z. Schlueter (the "Author")
2+
All rights reserved.
3+
4+
MIT +no-false-attribs License
5+
6+
Permission is hereby granted, free of charge, to any person
7+
obtaining a copy of this software and associated documentation
8+
files (the "Software"), to deal in the Software without
9+
restriction, including without limitation the rights to use,
10+
copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the
12+
Software is furnished to do so, subject to the following
13+
conditions:
14+
15+
The above copyright notice and this permission notice shall be
16+
included in all copies or substantial portions of the Software.
17+
18+
Distributions of all or part of the Software intended to be used
19+
by the recipients as they would use the unmodified Software,
20+
containing modifications that substantially alter, remove, or
21+
disable functionality of the Software, outside of the documented
22+
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.
26+
27+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
28+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
29+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
30+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
31+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
32+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
33+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
34+
OTHER DEALINGS IN THE SOFTWARE.
35+
36+
37+
Except where noted, this license applies to any and all software
38+
programs and associated documentation files created by the
39+
Author, when distributed with the Software.
40+
41+
"Node.js" and "node" trademark Joyent, Inc. npm is not officially
42+
part of the Node.js project, and is neither owned by nor
43+
officially affiliated with Joyent, Inc.
44+
45+
Packages published in the npm registry are not part of npm
46+
itself, are the sole property of their respective maintainers,
47+
and are not covered by this license.
48+
49+
"npm Logo" created by Mathias Pettersson and Brian Hammond,
50+
used with permission.
51+
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+
57+
This program uses "node-uuid", Copyright (c) 2010 Robert Kieffer,
58+
according to the terms of the MIT license.
59+
60+
This program uses "request", Copyright (c) 2011 Mikeal Rogers,
61+
according to the terms of the Apache license.

deps/npm/Makefile

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
SHELL = bash
2+
3+
markdowns = $(shell find doc -name '*.md' | grep -v 'index') README.md
4+
5+
cli_mandocs = $(shell find doc/cli -name '*.md' \
6+
|sed 's|.md|.1|g' \
7+
|sed 's|doc/cli/|man/man1/|g' ) \
8+
man/man1/README.1 \
9+
man/man1/index.1
10+
11+
api_mandocs = $(shell find doc/api -name '*.md' \
12+
|sed 's|.md|.3|g' \
13+
|sed 's|doc/api/|man/man3/|g' )
14+
15+
cli_htmldocs = $(shell find doc/cli -name '*.md' \
16+
|grep -v 'index.md' \
17+
|sed 's|.md|.html|g' \
18+
|sed 's|doc/cli/|html/doc/|g' ) \
19+
html/doc/README.html \
20+
html/doc/index.html
21+
22+
api_htmldocs = $(shell find doc/api -name '*.md' \
23+
|sed 's|.md|.html|g' \
24+
|sed 's|doc/api/|html/api/|g' )
25+
26+
mandocs = $(api_mandocs) $(cli_mandocs)
27+
28+
htmldocs = $(api_htmldocs) $(cli_htmldocs)
29+
30+
all: submodules doc
31+
32+
submodules:
33+
! [ -d .git ] || git submodule update --init --recursive
34+
35+
latest: submodules
36+
@echo "Installing latest published npm"
37+
@echo "Use 'make install' or 'make link' to install the code"
38+
@echo "in this folder that you're looking at right now."
39+
node cli.js install -g -f npm
40+
41+
install: all
42+
node cli.js install -g -f
43+
44+
# backwards compat
45+
dev: install
46+
47+
link: uninstall
48+
node cli.js link -f
49+
50+
clean: doc-clean uninstall
51+
rm npmrc
52+
node cli.js cache clean
53+
54+
uninstall: submodules
55+
node cli.js rm npm -g -f
56+
57+
doc: $(mandocs) $(htmldocs)
58+
59+
docclean: doc-clean
60+
doc-clean:
61+
rm -rf \
62+
node_modules/ronn \
63+
node_modules/.bin/ronn \
64+
.building_ronn \
65+
doc/cli/index.md \
66+
doc/api/index.md \
67+
$(api_mandocs) \
68+
$(cli_mandocs) \
69+
$(api_htmldocs) \
70+
$(cli_htmldocs) \
71+
&>/dev/null || true
72+
73+
# use `npm install ronn` for this to work.
74+
man/man1/README.1: README.md scripts/doc-build.sh package.json
75+
scripts/doc-build.sh $< $@
76+
77+
man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json
78+
@[ -d man/man1 ] || mkdir -p man/man1
79+
scripts/doc-build.sh $< $@
80+
81+
man/man3/%.3: doc/api/%.md scripts/doc-build.sh package.json
82+
@[ -d man/man3 ] || mkdir -p man/man3
83+
scripts/doc-build.sh $< $@
84+
85+
html/doc/README.html: README.md html/dochead.html html/docfoot.html scripts/doc-build.sh package.json
86+
scripts/doc-build.sh $< $@
87+
88+
html/doc/%.html: doc/cli/%.md html/dochead.html html/docfoot.html scripts/doc-build.sh package.json
89+
scripts/doc-build.sh $< $@
90+
91+
html/api/%.html: doc/api/%.md html/dochead.html html/docfoot.html scripts/doc-build.sh package.json
92+
scripts/doc-build.sh $< $@
93+
94+
doc/cli/index.md: $(markdowns) scripts/index-build.js scripts/doc-build.sh package.json
95+
node scripts/index-build.js > $@
96+
97+
node_modules/ronn:
98+
node cli.js install https://github.com/isaacs/ronnjs/tarball/master
99+
100+
doc: man
101+
102+
man: $(cli_docs) $(api_docs)
103+
104+
test: submodules
105+
node cli.js test
106+
107+
version: link
108+
git add package.json &&\
109+
git ci -m v$(shell npm -v)
110+
111+
publish: link
112+
git tag -s -m v$(shell npm -v) v$(shell npm -v) &&\
113+
git push origin master --tags &&\
114+
npm publish &&\
115+
make doc-publish
116+
117+
docpublish: doc-publish
118+
doc-publish: doc
119+
rsync -vazu --stats --no-implied-dirs --delete html/doc/ npmjs.org:/var/www/npmjs.org/public/doc
120+
rsync -vazu --stats --no-implied-dirs --delete html/api/ npmjs.org:/var/www/npmjs.org/public/api
121+
122+
sandwich:
123+
@[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || echo "make it yourself"
124+
125+
.PHONY: all latest install dev link doc clean uninstall test man doc-publish doc-clean docclean docpublish

0 commit comments

Comments
 (0)