Skip to content

Commit fcbbc7a

Browse files
bnoordhuisbnoordhuis
committed
Merge remote-tracking branch 'joyent/v0.12' into v0.12
Conflicts: Makefile deps/v8/src/base/platform/platform.h PR-URL: node-forward/node#65 Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
2 parents 21130c7 + 2d17193 commit fcbbc7a

File tree

766 files changed

+20243
-7253
lines changed

Some content is hidden

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

766 files changed

+20243
-7253
lines changed

‎Makefile‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,19 @@ test-debugger: all
153153
$(PYTHON) tools/test.py debugger
154154

155155
test-npm: $(NODE_EXE)
156-
./$(NODE_EXE) deps/npm/test/run.js
156+
rm -rf npm-cache npm-tmp npm-prefix
157+
mkdir npm-cache npm-tmp npm-prefix
158+
cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
159+
npm_config_prefix="$(shell pwd)/npm-prefix" \
160+
npm_config_tmp="$(shell pwd)/npm-tmp" \
161+
../../$(NODE_EXE) cli.js install
162+
cd deps/npm ; npm_config_cache="$(shell pwd)/npm-cache" \
163+
npm_config_prefix="$(shell pwd)/npm-prefix" \
164+
npm_config_tmp="$(shell pwd)/npm-tmp" \
165+
../../$(NODE_EXE) cli.js run-script test-all && \
166+
../../$(NODE_EXE) cli.js prune --prod && \
167+
cd ../.. && \
168+
rm -rf npm-cache npm-tmp npm-prefix
157169

158170
test-npm-publish: $(NODE_EXE)
159171
npm_package_config_publishtest=true ./$(NODE_EXE) deps/npm/test/run.js

‎deps/npm/.eslintrc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"env" : {
3+
"node" : true
4+
},
5+
"rules" : {
6+
"semi": [2, "never"],
7+
"strict": 0,
8+
"quotes": [1, "double", "avoid-escape"],
9+
"no-use-before-define": 0,
10+
"curly": 0,
11+
"no-underscore-dangle": 0,
12+
"no-lonely-if": 1,
13+
"no-unused-vars": [2, {"vars" : "all", "args" : "after-used"}],
14+
"no-mixed-requires": 0,
15+
"space-infix-ops": 0
16+
}
17+
}

‎deps/npm/.npmignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ html/*.png
2525
/npm-*.tgz
2626

2727
*.pyc
28+
29+
/test/tap/builtin-config

‎deps/npm/CHANGELOG.md‎

Lines changed: 315 additions & 0 deletions
Large diffs are not rendered by default.

‎deps/npm/Makefile‎

Lines changed: 70 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,28 @@ misc_mandocs = $(shell find doc/misc -name '*.md' \
3131
|sed 's|doc/misc/|man/man7/|g' ) \
3232
man/man7/npm-index.7
3333

34+
35+
cli_partdocs = $(shell find doc/cli -name '*.md' \
36+
|sed 's|.md|.html|g' \
37+
|sed 's|doc/cli/|html/partial/doc/cli/|g' ) \
38+
html/partial/doc/README.html
39+
40+
api_partdocs = $(shell find doc/api -name '*.md' \
41+
|sed 's|.md|.html|g' \
42+
|sed 's|doc/api/|html/partial/doc/api/|g' )
43+
44+
files_partdocs = $(shell find doc/files -name '*.md' \
45+
|sed 's|.md|.html|g' \
46+
|sed 's|doc/files/|html/partial/doc/files/|g' ) \
47+
html/partial/doc/files/npm-json.html \
48+
html/partial/doc/files/npm-global.html
49+
50+
misc_partdocs = $(shell find doc/misc -name '*.md' \
51+
|sed 's|.md|.html|g' \
52+
|sed 's|doc/misc/|html/partial/doc/misc/|g' ) \
53+
html/partial/doc/index.html
54+
55+
3456
cli_htmldocs = $(shell find doc/cli -name '*.md' \
3557
|sed 's|.md|.html|g' \
3658
|sed 's|doc/cli/|html/doc/cli/|g' ) \
@@ -53,6 +75,8 @@ misc_htmldocs = $(shell find doc/misc -name '*.md' \
5375

5476
mandocs = $(api_mandocs) $(cli_mandocs) $(files_mandocs) $(misc_mandocs)
5577

78+
partdocs = $(api_partdocs) $(cli_partdocs) $(files_partdocs) $(misc_partdocs)
79+
5680
htmldocs = $(api_htmldocs) $(cli_htmldocs) $(files_htmldocs) $(misc_htmldocs)
5781

5882
all: doc
@@ -63,7 +87,7 @@ latest:
6387
@echo "in this folder that you're looking at right now."
6488
node cli.js install -g -f npm
6589

66-
install: docclean all
90+
install: all
6791
node cli.js install -g -f
6892

6993
# backwards compat
@@ -79,7 +103,7 @@ clean: markedclean marked-manclean doc-clean uninstall
79103
uninstall:
80104
node cli.js rm npm -g -f
81105

82-
doc: $(mandocs) $(htmldocs)
106+
doc: $(mandocs) $(htmldocs) $(partdocs)
83107

84108
markedclean:
85109
rm -rf node_modules/marked node_modules/.bin/marked .building_marked
@@ -119,43 +143,73 @@ man/man5/%.5: doc/files/%.md scripts/doc-build.sh package.json
119143
@[ -d man/man5 ] || mkdir -p man/man5
120144
scripts/doc-build.sh $< $@
121145

146+
man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json
147+
@[ -d man/man7 ] || mkdir -p man/man7
148+
scripts/doc-build.sh $< $@
149+
150+
122151
doc/misc/npm-index.md: scripts/index-build.js package.json
123152
node scripts/index-build.js > $@
124153

125-
html/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
126-
@[ -d html/doc ] || mkdir -p html/doc
127-
scripts/doc-build.sh $< $@
128154

129-
man/man7/%.7: doc/misc/%.md scripts/doc-build.sh package.json
130-
@[ -d man/man7 ] || mkdir -p man/man7
155+
# html/doc depends on html/partial/doc
156+
html/doc/%.html: html/partial/doc/%.html
157+
@[ -d html/doc ] || mkdir -p html/doc
131158
scripts/doc-build.sh $< $@
132159

133-
html/doc/README.html: README.md $(html_docdeps)
160+
html/doc/README.html: html/partial/doc/README.html
134161
@[ -d html/doc ] || mkdir -p html/doc
135162
scripts/doc-build.sh $< $@
136163

137-
html/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
164+
html/doc/cli/%.html: html/partial/doc/cli/%.html
138165
@[ -d html/doc/cli ] || mkdir -p html/doc/cli
139166
scripts/doc-build.sh $< $@
140167

141-
html/doc/api/%.html: doc/api/%.md $(html_docdeps)
168+
html/doc/misc/%.html: html/partial/doc/misc/%.html
169+
@[ -d html/doc/misc ] || mkdir -p html/doc/misc
170+
scripts/doc-build.sh $< $@
171+
172+
html/doc/files/%.html: html/partial/doc/files/%.html
173+
@[ -d html/doc/files ] || mkdir -p html/doc/files
174+
scripts/doc-build.sh $< $@
175+
176+
html/doc/api/%.html: html/partial/doc/api/%.html
142177
@[ -d html/doc/api ] || mkdir -p html/doc/api
143178
scripts/doc-build.sh $< $@
144179

145-
html/doc/files/npm-json.html: html/doc/files/package.json.html
180+
181+
html/partial/doc/index.html: doc/misc/npm-index.md $(html_docdeps)
182+
@[ -d html/partial/doc ] || mkdir -p html/partial/doc
183+
scripts/doc-build.sh $< $@
184+
185+
html/partial/doc/README.html: README.md $(html_docdeps)
186+
@[ -d html/partial/doc ] || mkdir -p html/partial/doc
187+
scripts/doc-build.sh $< $@
188+
189+
html/partial/doc/cli/%.html: doc/cli/%.md $(html_docdeps)
190+
@[ -d html/partial/doc/cli ] || mkdir -p html/partial/doc/cli
191+
scripts/doc-build.sh $< $@
192+
193+
html/partial/doc/api/%.html: doc/api/%.md $(html_docdeps)
194+
@[ -d html/partial/doc/api ] || mkdir -p html/partial/doc/api
195+
scripts/doc-build.sh $< $@
196+
197+
html/partial/doc/files/npm-json.html: html/partial/doc/files/package.json.html
146198
cp $< $@
147-
html/doc/files/npm-global.html: html/doc/files/npm-folders.html
199+
html/partial/doc/files/npm-global.html: html/partial/doc/files/npm-folders.html
148200
cp $< $@
149201

150-
html/doc/files/%.html: doc/files/%.md $(html_docdeps)
151-
@[ -d html/doc/files ] || mkdir -p html/doc/files
202+
html/partial/doc/files/%.html: doc/files/%.md $(html_docdeps)
203+
@[ -d html/partial/doc/files ] || mkdir -p html/partial/doc/files
152204
scripts/doc-build.sh $< $@
153205

154-
html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
155-
@[ -d html/doc/misc ] || mkdir -p html/doc/misc
206+
html/partial/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
207+
@[ -d html/partial/doc/misc ] || mkdir -p html/partial/doc/misc
156208
scripts/doc-build.sh $< $@
157209

158210

211+
212+
159213
marked: node_modules/.bin/marked
160214

161215
node_modules/.bin/marked:

‎deps/npm/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ use npm itself to do.
154154
if (er) return commandFailed(er)
155155
// command succeeded, and data might have some info
156156
})
157-
npm.on("log", function (message) { .... })
157+
npm.registry.log.on("log", function (message) { .... })
158158
})
159159

160160
The `load` function takes an object hash of the command-line configs.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ log.info("it worked if it ends with", "ok")
2121

2222
var path = require("path")
2323
, npm = require("../lib/npm.js")
24-
, npmconf = require("npmconf")
24+
, npmconf = require("../lib/config/core.js")
2525
, errorHandler = require("../lib/utils/error-handler.js")
2626

2727
, configDefs = npmconf.defs

‎deps/npm/doc/api/npm-bin.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ npm-bin(3) -- Display npm bin folder
1010
Print the folder where npm will install executables.
1111

1212
This function should not be used programmatically. Instead, just refer
13-
to the `npm.bin` member.
13+
to the `npm.bin` property.

‎deps/npm/doc/api/npm-help-search.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ array of results is returned. Each result is an object with these properties:
2727
* file:
2828
Name of the file that matched
2929

30-
The silent parameter is not neccessary not used, but it may in the future.
30+
The silent parameter is not necessary not used, but it may in the future.

‎deps/npm/doc/api/npm-load.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ npm-load(3) -- Load config settings
1010
npm.load() must be called before any other function call. Both parameters are
1111
optional, but the second is recommended.
1212

13-
The first parameter is an object hash of command-line config params, and the
14-
second parameter is a callback that will be called when npm is loaded and
15-
ready to serve.
13+
The first parameter is an object containing command-line config params, and the
14+
second parameter is a callback that will be called when npm is loaded and ready
15+
to serve.
1616

1717
The first parameter should follow a similar structure as the package.json
1818
config object.

0 commit comments

Comments
 (0)