diff options
| author | isaacs <i@izs.me> | 2013-06-25 11:12:33 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-06-25 11:12:33 -0700 |
| commit | adf9b67e591fe1df9589412a75bad357a9410aa3 (patch) | |
| tree | 5d17c3a12c8d6d0edb67b596de4af90063ff1f2f /Makefile | |
| parent | b255f4c10a80343f9ce1cee56d0288361429e214 (diff) | |
| parent | 3fac4157fef1b083e199e04affbb6432f70861c2 (diff) | |
| download | android-node-v8-adf9b67e591fe1df9589412a75bad357a9410aa3.tar.gz android-node-v8-adf9b67e591fe1df9589412a75bad357a9410aa3.tar.bz2 android-node-v8-adf9b67e591fe1df9589412a75bad357a9410aa3.zip | |
Merge remote-tracking branch 'ry/v0.10' into master
Conflicts:
ChangeLog
deps/uv/ChangeLog
deps/uv/src/unix/stream.c
deps/uv/src/version.c
deps/v8/build/common.gypi
deps/v8/src/frames.h
deps/v8/src/runtime.cc
deps/v8/test/mjsunit/debug-set-variable-value.js
lib/http.js
src/node_version.h
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 20 insertions, 1 deletions
@@ -208,7 +208,8 @@ docopen: out/doc/api/all.html docclean: -rm -rf out/doc -VERSION=v$(shell $(PYTHON) tools/getnodeversion.py) +RAWVER=$(shell $(PYTHON) tools/getnodeversion.py) +VERSION=v$(RAWVER) RELEASE=$(shell $(PYTHON) tools/getnodeisrelease.py) PLATFORM=$(shell uname | tr '[:upper:]' '[:lower:]') ifeq ($(findstring x86_64,$(shell uname -m)),x86_64) @@ -236,6 +237,11 @@ BINARYTAR=$(BINARYNAME).tar.gz PKG=out/$(TARNAME).pkg packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker +PKGSRC=nodejs-$(DESTCPU)-$(RAWVER).tgz +ifdef NIGHTLY +PKGSRC=nodejs-$(DESTCPU)-$(RAWVER)-$(TAG).tgz +endif + dist: doc $(TARBALL) $(PKG) PKGDIR=out/dist-osx @@ -313,6 +319,19 @@ $(BINARYTAR): release-only binary: $(BINARYTAR) +$(PKGSRC): release-only + rm -rf dist out + $(PYTHON) configure --prefix=/ --without-snapshot \ + --dest-cpu=$(DESTCPU) --tag=$(TAG) $(CONFIG_FLAGS) + $(MAKE) install DESTDIR=dist + (cd dist; find * -type f | sort) > packlist + pkg_info -X pkg_install | \ + egrep '^(MACHINE_ARCH|OPSYS|OS_VERSION|PKGTOOLS_VERSION)' > build-info + pkg_create -B build-info -c tools/pkgsrc/comment -d tools/pkgsrc/description \ + -f packlist -I /opt/local -p dist -U $(PKGSRC) + +pkgsrc: $(PKGSRC) + dist-upload: $(TARBALL) $(PKG) ssh node@nodejs.org mkdir -p web/nodejs.org/dist/$(VERSION) scp $(TARBALL) node@nodejs.org:~/web/nodejs.org/dist/$(VERSION)/$(TARBALL) |