diff options
| author | Forrest L Norvell <forrest@npmjs.com> | 2015-02-06 01:14:25 -0800 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-06 18:38:36 +0100 |
| commit | af1bf49852b7a8bcc9b9b6dd718edea0b18e3cb6 (patch) | |
| tree | c9b3218b9df65485edca5f150bef4ba0263c8e28 /deps/npm/Makefile | |
| parent | 9dc9ec3ce6ba6f3dd4020e00f5863e207fa08a75 (diff) | |
| download | android-node-v8-af1bf49852b7a8bcc9b9b6dd718edea0b18e3cb6.tar.gz android-node-v8-af1bf49852b7a8bcc9b9b6dd718edea0b18e3cb6.tar.bz2 android-node-v8-af1bf49852b7a8bcc9b9b6dd718edea0b18e3cb6.zip | |
deps: upgrade npm to 2.5.1
PR-URL: https://github.com/iojs/io.js/pull/738
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/npm/Makefile')
| -rw-r--r-- | deps/npm/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/deps/npm/Makefile b/deps/npm/Makefile index 34d4b62de2..15655f3e5c 100644 --- a/deps/npm/Makefile +++ b/deps/npm/Makefile @@ -85,10 +85,10 @@ 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." - node cli.js install -g -f npm + node cli.js install -g -f npm ${NPMOPTS} install: all - node cli.js install -g -f + node cli.js install -g -f ${NPMOPTS} # backwards compat dev: install @@ -230,7 +230,12 @@ test: doc tag: npm tag npm@$(PUBLISHTAG) latest -publish: link doc +authors: + @bash scripts/update-authors.sh &&\ + git add AUTHORS &&\ + git commit -m "update AUTHORS" || true + +publish: link doc authors @git push origin :v$(shell npm -v) 2>&1 || true git clean -fd &&\ git push origin $(BRANCH) &&\ @@ -243,4 +248,4 @@ release: sandwich: @[ $$(whoami) = "root" ] && (echo "ok"; echo "ham" > sandwich) || (echo "make it yourself" && exit 13) -.PHONY: all latest install dev link doc clean uninstall test man doc-clean docclean release +.PHONY: all latest install dev link doc clean uninstall test man doc-clean docclean release authors |