@@ -5,17 +5,17 @@ PYTHON ?= python
55DESTDIR ?=
66SIGN ?=
77PREFIX ?= /usr/local
8- STAGINGSERVER ?= iojs -www
8+ STAGINGSERVER ?= node -www
99
1010OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
1111
1212# Determine EXEEXT
1313EXEEXT := $(shell $(PYTHON ) -c \
1414 "import sys; print('.exe' if sys.platform == 'win32' else '') ")
1515
16- NODE ?= ./iojs $(EXEEXT )
17- NODE_EXE = iojs $(EXEEXT )
18- NODE_G_EXE = iojs_g $(EXEEXT )
16+ NODE ?= ./node $(EXEEXT )
17+ NODE_EXE = node $(EXEEXT )
18+ NODE_G_EXE = node_g $(EXEEXT )
1919
2020# Flags for packaging.
2121BUILD_DOWNLOAD_FLAGS ?= --download=all
@@ -267,7 +267,7 @@ ifeq ($(DESTCPU),ia32)
267267override DESTCPU =x86
268268endif
269269
270- TARNAME =iojs -$(FULLVERSION )
270+ TARNAME =node -$(FULLVERSION )
271271TARBALL =$(TARNAME ) .tar
272272BINARYNAME =$(TARNAME ) -$(PLATFORM ) -$(ARCH )
273273BINARYTAR =$(BINARYNAME ) .tar
@@ -311,11 +311,11 @@ $(PKG): release-only
311311 $(MAKE ) install V=$(V ) DESTDIR=$(PKGDIR )
312312 SIGN=" $( CODESIGN_CERT) " PKGDIR=" $( PKGDIR) " bash tools/osx-codesign.sh
313313 cat tools/osx-pkg.pmdoc/index.xml.tmpl \
314- | sed -E " s/\\ {iojsversion \\ }/$( FULLVERSION) /g" \
314+ | sed -E " s/\\ {nodeversion \\ }/$( FULLVERSION) /g" \
315315 | sed -E " s/\\ {npmversion\\ }/$( NPMVERSION) /g" \
316316 > tools/osx-pkg.pmdoc/index.xml
317317 $(PACKAGEMAKER ) \
318- --id " org.iojs .pkg" \
318+ --id " org.node .pkg" \
319319 --doc tools/osx-pkg.pmdoc \
320320 --out $(PKG )
321321 SIGN=" $( PRODUCTSIGN_CERT) " PKG=" $( PKG) " bash tools/osx-productsign.sh
@@ -324,13 +324,13 @@ pkg: $(PKG)
324324
325325pkg-upload : pkg
326326 ssh $(STAGINGSERVER ) " mkdir -p staging/$( DISTTYPEDIR) /$( FULLVERSION) "
327- scp -p iojs -$(FULLVERSION ) .pkg $(STAGINGSERVER ) :staging/$(DISTTYPEDIR ) /$(FULLVERSION ) /iojs -$(FULLVERSION ) .pkg
328- ssh $(STAGINGSERVER ) " touch staging/$( DISTTYPEDIR) /$( FULLVERSION) /iojs -$( FULLVERSION) .pkg.done"
327+ scp -p node -$(FULLVERSION ) .pkg $(STAGINGSERVER ) :staging/$(DISTTYPEDIR ) /$(FULLVERSION ) /node -$(FULLVERSION ) .pkg
328+ ssh $(STAGINGSERVER ) " touch staging/$( DISTTYPEDIR) /$( FULLVERSION) /node -$( FULLVERSION) .pkg.done"
329329
330330$(TARBALL ) : release-only $(NODE_EXE ) doc
331331 git checkout-index -a -f --prefix=$(TARNAME ) /
332332 mkdir -p $(TARNAME ) /doc/api
333- cp doc/iojs .1 $(TARNAME ) /doc/iojs .1
333+ cp doc/node .1 $(TARNAME ) /doc/node .1
334334 cp -r out/doc/api/* $(TARNAME ) /doc/api/
335335 rm -rf $(TARNAME ) /deps/v8/{test,samples,tools/profviz} # too big
336336 rm -rf $(TARNAME ) /doc/images # too big
@@ -350,11 +350,11 @@ tar: $(TARBALL)
350350
351351tar-upload : tar
352352 ssh $(STAGINGSERVER ) " mkdir -p staging/$( DISTTYPEDIR) /$( FULLVERSION) "
353- scp -p iojs -$(FULLVERSION ) .tar.gz $(STAGINGSERVER ) :staging/$(DISTTYPEDIR ) /$(FULLVERSION ) /iojs -$(FULLVERSION ) .tar.gz
354- ssh $(STAGINGSERVER ) " touch staging/$( DISTTYPEDIR) /$( FULLVERSION) /iojs -$( FULLVERSION) .tar.gz.done"
353+ scp -p node -$(FULLVERSION ) .tar.gz $(STAGINGSERVER ) :staging/$(DISTTYPEDIR ) /$(FULLVERSION ) /node -$(FULLVERSION ) .tar.gz
354+ ssh $(STAGINGSERVER ) " touch staging/$( DISTTYPEDIR) /$( FULLVERSION) /node -$( FULLVERSION) .tar.gz.done"
355355ifeq ($(XZ ) , 0)
356- scp -p iojs -$(FULLVERSION).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs -$(FULLVERSION).tar.xz
357- ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs -$(FULLVERSION).tar.xz.done"
356+ scp -p node -$(FULLVERSION).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node -$(FULLVERSION).tar.xz
357+ ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node -$(FULLVERSION).tar.xz.done"
358358endif
359359
360360doc-upload : tar
@@ -415,11 +415,11 @@ binary: $(BINARYTAR)
415415
416416binary-upload : binary
417417 ssh $(STAGINGSERVER ) " mkdir -p staging/$( DISTTYPEDIR) /$( FULLVERSION) "
418- scp -p iojs -$(FULLVERSION ) -$(OSTYPE ) -$(ARCH ) .tar.gz $(STAGINGSERVER ) :staging/$(DISTTYPEDIR ) /$(FULLVERSION ) /iojs -$(FULLVERSION ) -$(OSTYPE ) -$(ARCH ) .tar.gz
419- ssh $(STAGINGSERVER ) " touch staging/$( DISTTYPEDIR) /$( FULLVERSION) /iojs -$( FULLVERSION) -$( OSTYPE) -$( ARCH) .tar.gz.done"
418+ scp -p node -$(FULLVERSION ) -$(OSTYPE ) -$(ARCH ) .tar.gz $(STAGINGSERVER ) :staging/$(DISTTYPEDIR ) /$(FULLVERSION ) /node -$(FULLVERSION ) -$(OSTYPE ) -$(ARCH ) .tar.gz
419+ ssh $(STAGINGSERVER ) " touch staging/$( DISTTYPEDIR) /$( FULLVERSION) /node -$( FULLVERSION) -$( OSTYPE) -$( ARCH) .tar.gz.done"
420420ifeq ($(XZ ) , 0)
421- scp -p iojs -$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs -$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz
422- ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/iojs -$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz.done"
421+ scp -p node -$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz $(STAGINGSERVER):staging/$(DISTTYPEDIR)/$(FULLVERSION)/node -$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz
422+ ssh $(STAGINGSERVER) "touch staging/$(DISTTYPEDIR)/$(FULLVERSION)/node -$(FULLVERSION)-$(OSTYPE)-$(ARCH).tar.xz.done"
423423endif
424424
425425haswrk =$(shell which wrk > /dev/null 2>&1; echo $$? )
0 commit comments