1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #2084. Makeify tools/osx-dist.sh

Browse Source
This commit is contained in:
Ryan Dahl 2011-11-20 19:22:30 -08:00
parent 61e796decc
commit 9d1bdbcf05
3 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -132,14 +132,25 @@ check:
VERSION=v$(shell python tools/getnodeversion.py) VERSION=v$(shell python tools/getnodeversion.py)
TARNAME=node-$(VERSION) TARNAME=node-$(VERSION)
TARBALL=$(TARNAME).tar.gz TARBALL=$(TARNAME).tar.gz
PKG=dist-osx/$(TARNAME).pkg PKG=out/$(TARNAME).pkg
packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
#dist: doc/node.1 doc/api #dist: doc/node.1 doc/api
dist: $(TARBALL) $(PKG) dist: $(TARBALL) $(PKG)
PKGDIR=out/dist-osx
pkg: $(PKG)
$(PKG): $(PKG):
-rm -rf dist-osx -rm -rf $(PKGDIR)
tools/osx-dist.sh $(WAF) configure --prefix=/usr/local
DESTDIR=$(PKGDIR) $(WAF) install
$(packagemaker) \
--id "org.nodejs.NodeJS-$(VERSION)" \
--doc tools/osx-pkg.pmdoc \
--out $(PKG)
$(TARBALL): out/doc $(TARBALL): out/doc
git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf - git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -

28
tools/osx-dist.sh
View File

@ -1,28 +0,0 @@
#!/bin/sh
TOOLS=`dirname $0`
ROOT=$TOOLS/..
VERSION=`python $TOOLS/getnodeversion.py`
CONTENTS=$ROOT/dist-osx
PMDOC=$TOOLS/osx-pkg.pmdoc
VENDOR='org.nodejs'
NAME=NodeJS
# go build it in the root of the git repository
pushd $ROOT
./configure --prefix=/usr/local
make
make install DESTDIR="$CONTENTS"
popd # $ROOT
PKGID="$VENDOR.$NAME-$VERSION"
packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
$packagemaker \
--id "$PKGID" \
--doc $PMDOC \
--out $CONTENTS/node-v$VERSION.pkg

2
tools/osx-pkg.pmdoc/01local.xml
View File

@ -1 +1 @@
<pkgref spec="1.12" uuid="053587FE-BDF3-4EF5-815D-281427431048"><config><identifier>org.nodejs.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../dist-osx/usr/local/</installFrom><installTo mod="true" relocatable="true">/usr/local</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.isRelativeType</mod><mod>installTo</mod><mod>locationType</mod><mod>relocatable</mod><mod>installFrom.path</mod><mod>installTo.isAbsoluteType</mod><mod>identifier</mod><mod>parent</mod><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod></config><contents><file-list>01local-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> <pkgref spec="1.12" uuid="053587FE-BDF3-4EF5-815D-281427431048"><config><identifier>org.nodejs.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../out/dist-osx/usr/local/</installFrom><installTo mod="true" relocatable="true">/usr/local</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.isRelativeType</mod><mod>installTo</mod><mod>locationType</mod><mod>relocatable</mod><mod>installFrom.path</mod><mod>installTo.isAbsoluteType</mod><mod>identifier</mod><mod>parent</mod><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod></config><contents><file-list>01local-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>