build: rename binary from node to iojs

.gitignore

@@ -10,8 +10,8 @@ tags
 doc/api.xml
 tmp/
 test/tmp*/
-node
-node_g
+iojs
+iojs_g
 *.swp
 .benchmark_reports
 /.project

Makefile

@@ -11,9 +11,9 @@ PREFIX ?= /usr/local
 EXEEXT := $(shell $(PYTHON) -c \
 		"import sys; print('.exe' if sys.platform == 'win32' else '')")
 
-NODE ?= ./node$(EXEEXT)
-NODE_EXE = node$(EXEEXT)
-NODE_G_EXE = node_g$(EXEEXT)
+NODE ?= ./iojs$(EXEEXT)
+NODE_EXE = iojs$(EXEEXT)
+NODE_G_EXE = iojs_g$(EXEEXT)
 
 # Default to verbose builds.
 # To do quiet/pretty builds, run `make V=` to set V to an empty string,
@@ -99,25 +99,20 @@ test: all
 test-parallel: all
 	$(PYTHON) tools/test.py --mode=release parallel -J
 
-test-http1: all
-	$(PYTHON) tools/test.py --mode=release --use-http1 sequential parallel message
-
 test-valgrind: all
 	$(PYTHON) tools/test.py --mode=release --valgrind sequential parallel message
 
-test/gc/node_modules/weak/build/Release/weakref.node:
-	@if [ ! -f $(NODE_EXE) ]; then make all; fi
+test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
 	./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
 		--directory="$(shell pwd)/test/gc/node_modules/weak" \
 		--nodedir="$(shell pwd)"
 
-build-addons:
-	@if [ ! -f node ]; then make all; fi
+build-addons: $(NODE_EXE)
 	rm -rf test/addons/doc-*/
-	./node tools/doc/addon-verify.js
+	./$(NODE_EXE) tools/doc/addon-verify.js
 	$(foreach dir, \
 			$(sort $(dir $(wildcard test/addons/*/*.gyp))), \
-			./node deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
+			./$(NODE_EXE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
 					--directory="$(shell pwd)/$(dir)" \
 					--nodedir="$(shell pwd)" && ) echo "build done"
 
@@ -130,9 +125,6 @@ test-all: test-build test/gc/node_modules/weak/build/Release/weakref.node
 	$(PYTHON) tools/test.py --mode=debug,release
 	make test-npm
 
-test-all-http1: test-build
-	$(PYTHON) tools/test.py --mode=debug,release --use-http1
-
 test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
@@ -224,16 +216,6 @@ email.md: ChangeLog tools/email-footer.md
 blog.html: email.md
 	cat $< | ./$(NODE_EXE) tools/doc/node_modules/.bin/marked > $@
 
-website-upload: doc
-	rsync -r out/doc/ [email protected]:~/web/nodejs.org/
-	ssh [email protected] '\
-    rm -f ~/web/nodejs.org/dist/latest &&\
-    ln -s $(VERSION) ~/web/nodejs.org/dist/latest &&\
-    rm -f ~/web/nodejs.org/docs/latest &&\
-    ln -s $(VERSION) ~/web/nodejs.org/docs/latest &&\
-    rm -f ~/web/nodejs.org/dist/node-latest.tar.gz &&\
-    ln -s $(VERSION)/node-$(VERSION).tar.gz ~/web/nodejs.org/dist/node-latest.tar.gz'
-
 docopen: out/doc/api/all.html
 	-google-chrome out/doc/api/all.html
 
@@ -258,20 +240,20 @@ else
 ARCH=x86
 endif
 endif
-TARNAME=node-$(VERSION)
+TARNAME=iojs-$(VERSION)
 ifdef NIGHTLY
 TAG = nightly-$(NIGHTLY)
-TARNAME=node-$(VERSION)-$(TAG)
+TARNAME=iojs-$(VERSION)-$(TAG)
 endif
 TARBALL=$(TARNAME).tar.gz
 BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
 BINARYTAR=$(BINARYNAME).tar.gz
 PKG=out/$(TARNAME).pkg
 packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
 
-PKGSRC=nodejs-$(DESTCPU)-$(RAWVER).tgz
+PKGSRC=iojs-$(DESTCPU)-$(RAWVER).tgz
 ifdef NIGHTLY
-PKGSRC=nodejs-$(DESTCPU)-$(RAWVER)-$(TAG).tgz
+PKGSRC=iojs-$(DESTCPU)-$(RAWVER)-$(TAG).tgz
 endif
 
 dist: doc $(TARBALL) $(PKG)
@@ -311,11 +293,11 @@ $(PKG): release-only
 	$(PYTHON) ./configure --without-snapshot --dest-cpu=x64 --tag=$(TAG)
 	$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
 	SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
-	lipo $(PKGDIR)/32/usr/local/bin/node \
-		$(PKGDIR)/usr/local/bin/node \
-		-output $(PKGDIR)/usr/local/bin/node-universal \
+	lipo $(PKGDIR)/32/usr/local/bin/iojs \
+		$(PKGDIR)/usr/local/bin/iojs \
+		-output $(PKGDIR)/usr/local/bin/iojs-universal \
 		-create
-	mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node
+	mv $(PKGDIR)/usr/local/bin/iojs-universal $(PKGDIR)/usr/local/bin/iojs
 	rm -rf $(PKGDIR)/32
 	$(packagemaker) \
 		--id "org.nodejs.Node" \
@@ -326,7 +308,7 @@ $(PKG): release-only
 $(TARBALL): release-only $(NODE_EXE) doc
 	git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
 	mkdir -p $(TARNAME)/doc/api
-	cp doc/node.1 $(TARNAME)/doc/node.1
+	cp doc/iojs.1 $(TARNAME)/doc/iojs.1
 	cp -r out/doc/api/* $(TARNAME)/doc/api/
 	rm -rf $(TARNAME)/deps/v8/test # too big
 	rm -rf $(TARNAME)/doc/images # too big
@@ -364,11 +346,6 @@ $(PKGSRC): release-only
 
 pkgsrc: $(PKGSRC)
 
-dist-upload: $(TARBALL) $(PKG)
-	ssh [email protected] mkdir -p web/nodejs.org/dist/$(VERSION)
-	scp $(TARBALL) [email protected]:~/web/nodejs.org/dist/$(VERSION)/$(TARBALL)
-	scp $(PKG) [email protected]:~/web/nodejs.org/dist/$(VERSION)/$(TARNAME).pkg
-
 wrkclean:
 	$(MAKE) -C tools/wrk/ clean
 	rm tools/wrk/wrk