Skip to content

Commit

Permalink
Ship the custom node binary build with atom-shell.
Browse files Browse the repository at this point in the history
This is required by the child_process.fork, which is indeed executing
the node binary to start a script.

The node fork can be found at:
https://github.com/atom/cefode-node/tree/chromium-v8
  • Loading branch information
zcbenz committed May 11, 2013
1 parent 85e22c0 commit ebac5f9
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.DS_Store
build/
node/
node_modules/
vendor/
*.xcodeproj
Expand Down
9 changes: 8 additions & 1 deletion atom.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,14 @@
'files': [
'browser/default_app',
],
}
},
{
# Copy node binary for worker process support.
'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources',
'files': [
'node/node',
],
},
],
'postbuilds': [
{
Expand Down
2 changes: 2 additions & 0 deletions script/update
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ set -e

cd "$(dirname "$0")/.."

./script/update-node v0.10.5

gyp --depth . atom.gyp \
-Ivendor/brightray/brightray.gypi \
-Dtarget_arch=ia32 \
Expand Down
31 changes: 31 additions & 0 deletions script/update-node
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/bash

set -e

cd "$(dirname $0)/.."

NODE_VERSION=v0.10.5
[ -z $1 ] || NODE_VERSION=$1

# Test whether we need update.
if [ -f "node/node" ] && [[ `node/node --version` == $NODE_VERSION ]] ; then
exit 0
fi

case $OSTYPE in
darwin*) NODE_PLATFORM=darwin ;;
linux*) NODE_PLATFORM=linux ;;
*) echo "Unsupported platform $OSTYPE" && exit 1 ;;
esac

NODE_DIST_NAME="node-$NODE_VERSION-$NODE_PLATFORM-x86"

# Download node and untar
NODE_TARBALL_URL="https://gh-contractor-zcbenz.s3.amazonaws.com/node/dist/$NODE_DIST_NAME.tar.gz"
TARGET_DIR='node'
[ -d "$TARGET_DIR" ] || mkdir "$TARGET_DIR"
cd "$TARGET_DIR"
curl -fsSkL $NODE_TARBALL_URL | tar -zx || exit 1

cp "$NODE_DIST_NAME/bin/node" .
rm -rf "$NODE_DIST_NAME"
2 changes: 1 addition & 1 deletion vendor/node
Submodule node updated from 5c651d to bb77a4

0 comments on commit ebac5f9

Please sign in to comment.