From dc39ab3bbf22f624b7dccc66766aeda23c854579 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Thu, 10 Nov 2011 18:16:51 -0800 Subject: [PATCH] Improve OSX installer --- .gitignore | 1 + Makefile | 1 + doc/mac_osx_nodejs_installer_logo.png | Bin 0 -> 23317 bytes tools/msvs/msi/getnodeversion.py | 2 +- tools/osx-dist.sh | 23 +++++---- tools/osx-pkg-dmg-create.sh | 65 -------------------------- tools/osx-pkg.pmdoc/01local.xml | 1 + tools/osx-pkg.pmdoc/index.xml | 15 ++++++ 8 files changed, 33 insertions(+), 75 deletions(-) create mode 100644 doc/mac_osx_nodejs_installer_logo.png delete mode 100755 tools/osx-pkg-dmg-create.sh create mode 100644 tools/osx-pkg.pmdoc/01local.xml create mode 100644 tools/osx-pkg.pmdoc/index.xml diff --git a/.gitignore b/.gitignore index 68b5843eeb..2b27112ac8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ ipch/ /options.gypi *-nodegyp* /gyp-mac-tool +/dist-osx diff --git a/Makefile b/Makefile index 2ac3cd7439..1d207cd025 100644 --- a/Makefile +++ b/Makefile @@ -120,6 +120,7 @@ clean: distclean: docclean -find tools -name "*.pyc" | xargs rm -f + -rm -rf dist-osx -rm -rf out/ node node_g check: diff --git a/doc/mac_osx_nodejs_installer_logo.png b/doc/mac_osx_nodejs_installer_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8570d914fd6d6356fc619a1391b1b46b38edc38e GIT binary patch literal 23317 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 literal 0 HcmV?d00001 diff --git a/tools/msvs/msi/getnodeversion.py b/tools/msvs/msi/getnodeversion.py index a9a5274fb2..551d95d0e0 100644 --- a/tools/msvs/msi/getnodeversion.py +++ b/tools/msvs/msi/getnodeversion.py @@ -6,4 +6,4 @@ for line in sys.stdin: minor = line.split()[2] if re.match('#define NODE_PATCH_VERSION', line): patch = line.split()[2] -print '{0:s}.{1:s}.{2:s}.0'.format(major, minor, patch) +print '{0:s}.{1:s}.{2:s}'.format(major, minor, patch) diff --git a/tools/osx-dist.sh b/tools/osx-dist.sh index d139bf4ac6..98fb23203e 100755 --- a/tools/osx-dist.sh +++ b/tools/osx-dist.sh @@ -3,21 +3,26 @@ TOOLS=`dirname $0` ROOT=$TOOLS/.. -VERSION=`git describe` -CONTENTS=dist-osx/nodejs-$VERSION +VERSION=`python $TOOLS/msvs/msi/getnodeversion.py < $ROOT/src/node_version.h` +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/nodejs +./configure --prefix=/usr/local make make install DESTDIR="$CONTENTS" -mkdir -p "$CONTENTS/usr/local/bin" -pushd "$CONTENTS/usr/local/bin" -ln -s ../nodejs/bin/* . -popd # $CONTENTS/usr/local/bin - popd # $ROOT -"$TOOLS/osx-pkg-dmg-create.sh" "$ROOT/$CONTENTS" NodeJS $VERSION 'org.nodejs' +PKGID="$VENDOR.$NAME-$VERSION" + +packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker + +$packagemaker \ + --id "$PKGID" \ + --doc $PMDOC \ + --out $CONTENTS/node-$VERSION.pkg diff --git a/tools/osx-pkg-dmg-create.sh b/tools/osx-pkg-dmg-create.sh deleted file mode 100755 index e288d8f190..0000000000 --- a/tools/osx-pkg-dmg-create.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# Create a complete OS .dmg file (it needs the Apple Developers Tools installed) -# usage: -# pkg-create.sh -# - -CONTENTS=$1 -shift -NAME=$1 -shift -VERSION=$1 -shift -VENDOR=$1 - -PKGID="$VENDOR.$NAME-$VERSION" - -# unused pkg-info entries so far -# -# CFBundleExecutable -# $NAME -# CFBundleSignature -# ???? - -# -# Need the .plist file in order for the packagemaker to create a package which the -# pkgutil --packages later on would return an entry about. pkgutil can then --unlink -# and --forget about the package nicely. -# -cat > "$CONTENTS.plist" < - - - - CFBundleDevelopmentRegion - en - CFBundleIdentifier - $PKGID - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $NAME - CFBundlePackageType - APPL - CFBundleShortVersionString - $VERSION - CFBundleVersion - $VERSION - - -PINFO - -packagemaker=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker - -$packagemaker \ - --id "$PKGID" \ - --info "$CONTENTS.plist" \ - --root "$CONTENTS" \ - --target 10.5 \ - --out "$CONTENTS".pkg - -hdiutil create "$CONTENTS.dmg" \ - -format UDZO -ov \ - -volname "$NAME $VERSION" \ - -srcfolder $CONTENTS.pkg - diff --git a/tools/osx-pkg.pmdoc/01local.xml b/tools/osx-pkg.pmdoc/01local.xml new file mode 100644 index 0000000000..91e2156a04 --- /dev/null +++ b/tools/osx-pkg.pmdoc/01local.xml @@ -0,0 +1 @@ +org.nodejs.pkg1.0../dist-osx/usr/local//usr/localinstallTo.isRelativeTypeinstallTolocationTyperelocatableinstallFrom.pathinstallTo.isAbsoluteTypeidentifierparentinstallTo.pathinstallFrom.isRelativeType01local-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/tools/osx-pkg.pmdoc/index.xml b/tools/osx-pkg.pmdoc/index.xml new file mode 100644 index 0000000000..56b96bd2e4 --- /dev/null +++ b/tools/osx-pkg.pmdoc/index.xml @@ -0,0 +1,15 @@ +Node/Users/ryan/Desktop/Node.pkgorg.nodejs../doc/mac_osx_nodejs_installer_logo.png01local.xmlproperties.titleproperties.userDomainproperties.anywhereDomainproperties.systemDomain \ No newline at end of file