Permalink
Browse files

Makefile: use Windows arch naming for the binary tarballs

i.e. "x86" or "x64".

Also update the email-footer.md to reflect the changes.

Fixes #3842.
  • Loading branch information...
TooTallNate committed Aug 7, 2012
1 parent 093be8b commit c7372d06a32222e5110bfeb8e3cf8b755ace4ec2
Showing with 9 additions and 11 deletions.
  1. +5 −7 Makefile
  2. +4 −4 tools/email-footer.md
View
@@ -193,14 +193,12 @@ docclean:
VERSION=v$(shell $(PYTHON) tools/getnodeversion.py)
PLATFORM=$(shell uname | tr '[:upper:]' '[:lower:]')
-ifeq ($(DESTCPU),x64)
-ARCH=x86_64
-else
-ifeq ($(DESTCPU),ia32)
-ARCH=i386
-else
-ARCH=$(shell uname -m)
+ifeq ($(DESTCPU),)
+DESTCPU=$(shell ./node -pe process.arch)

This comment has been minimized.

Show comment Hide comment
@isaacs

isaacs Aug 8, 2012

It would be better to not require node to already be built. What about something like this? https://github.com/isaacs/nave/blob/master/nave.sh#L35-45

It could be good to put it in a bash script in tools/ if it gets too complicated.

@isaacs

isaacs Aug 8, 2012

It would be better to not require node to already be built. What about something like this? https://github.com/isaacs/nave/blob/master/nave.sh#L35-45

It could be good to put it in a bash script in tools/ if it gets too complicated.

endif
+ARCH=$(DESTCPU)
+ifeq ($(ARCH),ia32)
+ARCH=x86
endif
TARNAME=node-$(VERSION)
TARBALL=$(TARNAME).tar.gz
View
@@ -8,13 +8,13 @@ Windows x64 Installer: http://nodejs.org/dist/__VERSION__/x64/node-__VERSION__-x
Windows x64 Files: http://nodejs.org/dist/__VERSION__/x64/
-Linux 32-bit Binary Package: http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-i686.tar.gz
+Linux 32-bit: http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x86.tar.gz
-Linux 64-bit Binary Package: http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x86_64.tar.gz
+Linux 64-bit: http://nodejs.org/dist/__VERSION__/node-__VERSION__-linux-x64.tar.gz
-Solaris 32-bit Binary Package: http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-i386.tar.gz
+Solaris 32-bit: http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x86.tar.gz
-Solaris 64-bit Binary Package: http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x86_64.tar.gz
+Solaris 64-bit: http://nodejs.org/dist/__VERSION__/node-__VERSION__-sunos-x64.tar.gz
Other release files: http://nodejs.org/dist/__VERSION__/

1 comment on commit c7372d0

@isaacs

This comment has been minimized.

Show comment Hide comment
@isaacs

isaacs Aug 8, 2012

Apart from the dependency on ./node, lgtm.

isaacs commented on c7372d0 Aug 8, 2012

Apart from the dependency on ./node, lgtm.

Please sign in to comment.