diff --git a/Makefile b/Makefile index da076378130..31a2dde7351 100644 --- a/Makefile +++ b/Makefile @@ -213,30 +213,7 @@ dist: doc $(TARBALL) $(PKG) PKGDIR=out/dist-osx -pkg: $(PKG) - -$(PKG): - rm -rf $(PKGDIR) - rm -rf out/deps out/Release - ./configure --prefix=$(PKGDIR)/32/usr/local --without-snapshot --dest-cpu=ia32 - $(MAKE) install V=$(V) - rm -rf out/deps out/Release - ./configure --prefix=$(PKGDIR)/usr/local --without-snapshot --dest-cpu=x64 - $(MAKE) install V=$(V) - SIGN="$(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 \ - -create - mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node - rm -rf $(PKGDIR)/32 - $(packagemaker) \ - --id "org.nodejs.Node" \ - --doc tools/osx-pkg.pmdoc \ - --out $(PKG) - SIGN="$(SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh - -$(TARBALL): node doc +release-only: @if [ "$(shell git status --porcelain | egrep -v '^\?\? ')" = "" ]; then \ exit 0 ; \ else \ @@ -257,6 +234,31 @@ $(TARBALL): node doc echo "" >&2 ; \ exit 1 ; \ fi + +pkg: $(PKG) + +$(PKG): release-only + rm -rf $(PKGDIR) + rm -rf out/deps out/Release + ./configure --prefix=$(PKGDIR)/32/usr/local --without-snapshot --dest-cpu=ia32 + $(MAKE) install V=$(V) + rm -rf out/deps out/Release + ./configure --prefix=$(PKGDIR)/usr/local --without-snapshot --dest-cpu=x64 + $(MAKE) install V=$(V) + SIGN="$(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 \ + -create + mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node + rm -rf $(PKGDIR)/32 + $(packagemaker) \ + --id "org.nodejs.Node" \ + --doc tools/osx-pkg.pmdoc \ + --out $(PKG) + SIGN="$(SIGN)" PKG="$(PKG)" bash tools/osx-productsign.sh + +$(TARBALL): release-only node doc git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf - mkdir -p $(TARNAME)/doc/api cp doc/node.1 $(TARNAME)/doc/node.1 @@ -270,7 +272,7 @@ $(TARBALL): node doc tar: $(TARBALL) -$(BINARYTAR): +$(BINARYTAR): release-only rm -rf $(BINARYNAME) rm -rf out/deps out/Release ./configure --prefix=/ --without-snapshot --dest-cpu=$(DESTCPU) @@ -308,4 +310,4 @@ cpplint: lint: jslint cpplint -.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install install-includes install-bin all staticlib dynamiclib test test-all website-upload pkg blog blogclean tar binary +.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install install-includes install-bin all staticlib dynamiclib test test-all website-upload pkg blog blogclean tar binary release-only