From: isaacs Date: Fri, 12 Jul 2013 20:14:50 +0000 (-0700) Subject: npm: Upgrade to 1.3.4 X-Git-Tag: v0.10.14~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e86519199b28e9fe2241c8f6531350ed753613d;p=platform%2Fupstream%2Fnodejs.git npm: Upgrade to 1.3.4 --- diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 01228c1..28c7ff6 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -27,7 +27,7 @@ files_mandocs = $(shell find doc/files -name '*.md' \ misc_mandocs = $(shell find doc/misc -name '*.md' \ |sed 's|.md|.7|g' \ |sed 's|doc/misc/|man/man7/|g' ) \ - man/man7/index.7 + man/man7/npm-index.7 cli_htmldocs = $(shell find doc/cli -name '*.md' \ |sed 's|.md|.html|g' \ @@ -61,7 +61,7 @@ latest: @echo "in this folder that you're looking at right now." node cli.js install -g -f npm -install: all +install: docclean all node cli.js install -g -f # backwards compat @@ -70,7 +70,7 @@ dev: install link: uninstall node cli.js link -f -clean: doc-clean uninstall +clean: ronnclean doc-clean uninstall rm npmrc node cli.js cache clean @@ -79,15 +79,16 @@ uninstall: doc: $(mandocs) $(htmldocs) +ronnclean: + rm -rf node_modules/ronn node_modules/.bin/ronn .building_ronn + docclean: doc-clean doc-clean: rm -rf \ - node_modules/ronn \ - node_modules/.bin/ronn \ .building_ronn \ html/doc \ html/api \ - man/man* + man # use `npm install ronn` for this to work. man/man1/npm-README.1: README.md scripts/doc-build.sh package.json @@ -150,6 +151,7 @@ html/doc/misc/%.html: doc/misc/%.md $(html_docdeps) +ronn: node_modules/.bin/ronn node_modules/.bin/ronn: node cli.js install ronn diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index 9d666ed..f1611d5 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -240,7 +240,7 @@ will no doubt tell you to put the output in a gist or email.

- + diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html index a44f1de..1dee0e1 100644 --- a/deps/npm/html/doc/misc/npm-coding-style.html +++ b/deps/npm/html/doc/misc/npm-coding-style.html @@ -182,7 +182,7 @@ set to anything."

- +