diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2011-11-23 01:01:10 +0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2011-11-23 01:01:10 +0400 |
commit | 8595981195f8b73fb113a6da2c1449e79b9fcd11 (patch) | |
tree | bea90f4db6b2adb93b868625d96d85d67b2c4656 /tools | |
parent | b3f91f15b2482a8f3e5d37f0e09429a4b4775230 (diff) | |
parent | 3abebfea98b9a5b0e048106884c56f9162400ed4 (diff) |
Merge remote branch 'origin/v0.6'
Conflicts:
Makefile
src/node_version.h
test/simple/test-crypto.js
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/osx-dist.sh | 28 | ||||
-rw-r--r-- | tools/osx-pkg-postinstall.sh | 5 | ||||
-rw-r--r-- | tools/osx-pkg.pmdoc/01local-contents.xml | 1 | ||||
-rw-r--r-- | tools/osx-pkg.pmdoc/01local.xml | 2 | ||||
-rw-r--r-- | tools/osx-pkg.pmdoc/02npm-contents.xml | 1 | ||||
-rw-r--r-- | tools/osx-pkg.pmdoc/02npm.xml | 1 | ||||
-rw-r--r-- | tools/osx-pkg.pmdoc/index.xml | 10 | ||||
-rw-r--r-- | tools/wafadmin/Build.py | 2 |
8 files changed, 17 insertions, 33 deletions
diff --git a/tools/osx-dist.sh b/tools/osx-dist.sh deleted file mode 100755 index 496aead1cdf..00000000000 --- a/tools/osx-dist.sh +++ /dev/null @@ -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 diff --git a/tools/osx-pkg-postinstall.sh b/tools/osx-pkg-postinstall.sh new file mode 100644 index 00000000000..c4c872fc785 --- /dev/null +++ b/tools/osx-pkg-postinstall.sh @@ -0,0 +1,5 @@ +#!/bin/sh +# TODO Can this be done inside the .pmdoc? +# TODO Can we extract $PREFIX from the installer? +cd /usr/local/bin +ln -sf ../lib/node_modules/npm/bin/npm-cli.js npm diff --git a/tools/osx-pkg.pmdoc/01local-contents.xml b/tools/osx-pkg.pmdoc/01local-contents.xml new file mode 100644 index 00000000000..bc1e5a791fd --- /dev/null +++ b/tools/osx-pkg.pmdoc/01local-contents.xml @@ -0,0 +1 @@ +<pkg-contents spec="1.12"/>
\ No newline at end of file diff --git a/tools/osx-pkg.pmdoc/01local.xml b/tools/osx-pkg.pmdoc/01local.xml index 91e2156a04c..18fd871248d 100644 --- a/tools/osx-pkg.pmdoc/01local.xml +++ b/tools/osx-pkg.pmdoc/01local.xml @@ -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>
\ No newline at end of file +<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></pkgref>
\ No newline at end of file diff --git a/tools/osx-pkg.pmdoc/02npm-contents.xml b/tools/osx-pkg.pmdoc/02npm-contents.xml new file mode 100644 index 00000000000..bc1e5a791fd --- /dev/null +++ b/tools/osx-pkg.pmdoc/02npm-contents.xml @@ -0,0 +1 @@ +<pkg-contents spec="1.12"/>
\ No newline at end of file diff --git a/tools/osx-pkg.pmdoc/02npm.xml b/tools/osx-pkg.pmdoc/02npm.xml new file mode 100644 index 00000000000..f97de66e066 --- /dev/null +++ b/tools/osx-pkg.pmdoc/02npm.xml @@ -0,0 +1 @@ +<pkgref spec="1.12" uuid="DF0233A3-6B5D-4FBF-8048-8FC57F42278F"><config><identifier>org.nodejs.node.npm.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../deps/npm</installFrom><installTo mod="true">/usr/local/lib/node_modules/npm</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>installTo.isAbsoluteType</mod><mod>scripts.postinstall.isRelativeType</mod><mod>parent</mod><mod>installTo</mod></config><scripts><postinstall relative="true" mod="true">osx-pkg-postinstall.sh</postinstall></scripts></pkgref>
\ No newline at end of file diff --git a/tools/osx-pkg.pmdoc/index.xml b/tools/osx-pkg.pmdoc/index.xml index 56b96bd2e40..d805747fcfd 100644 --- a/tools/osx-pkg.pmdoc/index.xml +++ b/tools/osx-pkg.pmdoc/index.xml @@ -1,9 +1,9 @@ -<pkmkdoc spec="1.12"><properties><title>Node</title><build>/Users/ryan/Desktop/Node.pkg</build><organization>org.nodejs</organization><userSees ui="easy"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="node" id="choice3" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.nodejs.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="background">../doc/mac_osx_nodejs_installer_logo.png</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +<pkmkdoc spec="1.12"><properties><title>Node</title><build>/Users/ryan/Desktop/Node.pkg</build><organization>org.nodejs</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="node" id="choice3" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.nodejs.pkg"/></choice><choice title="npm" id="choice4" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.nodejs.node.npm.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="background">../doc/mac_osx_nodejs_installer_logo.png</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural -\f0\fs26 \cf0 This package will install node and node-waf into /usr/local/bin}]]></resource><resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +\f0\fs26 \cf0 This package will install node and npm into /usr/local/bin}]]></resource><resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural @@ -12,4 +12,8 @@ \ /usr/local/bin/node\ \ -Make sure that /usr/local/bin is in your path.}]]></resource></locale></resources><flags/><item type="file">01local.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file +NPM was installed at\ +\ + /usr/local/bin/npm\ +\ +Make sure that /usr/local/bin is in your $PATH.}]]></resource></locale></resources><flags/><item type="file">01local.xml</item><item type="file">02npm.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file diff --git a/tools/wafadmin/Build.py b/tools/wafadmin/Build.py index 10700ec20e4..675bca1c47e 100644 --- a/tools/wafadmin/Build.py +++ b/tools/wafadmin/Build.py @@ -773,7 +773,7 @@ class BuildContext(Utils.Context): try: shutil.copy2(src, tgt) - os.chmod(tgt, chmod) + if chmod >= 0: os.chmod(tgt, chmod) except IOError: try: os.stat(src) |