From a60e35450c2224fe1589c5225ddc9a98bcb55ba0 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 14 Feb 2015 03:17:14 +0400 Subject: [PATCH] update setup-local-dev script --- package.json | 4 +- scripts/setup-local-dev.sh | 92 +++++++++++++++++++++++++++----------- 2 files changed, 69 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 8727ca2b..c265f935 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,9 @@ "through": "2.2.0", "tmp": "~0.0.20", "uglify-js": "2.4.16", - "ws": "0.4.31" + "ws": "0.4.31", + "read": "~1.0.5", + "form-data": "~0.2.0" }, "optionalDependencies": { "heapdump": "0.2.10" diff --git a/scripts/setup-local-dev.sh b/scripts/setup-local-dev.sh index d1a8c71d..e530bd1f 100755 --- a/scripts/setup-local-dev.sh +++ b/scripts/setup-local-dev.sh @@ -32,36 +32,76 @@ SOURCE=`pwd` LOCAL=$SOURCE/local APPDIR=$SOURCE/build/webkitbuilds/app.nw -LOCALCFG=configs/client-default-local.js -if [ ! -d $SOURCE/build/webkitbuilds/cache/mac/0.9.3 ]; then - mkdir -p $SOURCE/build/webkitbuilds/cache/mac/0.9.3/node-webkit.app - pushd $SOURCE/build/webkitbuilds/cache/mac/0.9.3 - curl -O http://dl.node-webkit.org/v0.9.3/node-webkit-v0.9.3-pre8-osx-ia32.zip - unzip node-webkit-v0.9.3-pre8-osx-ia32.zip +if [ "$os" == "darwin" ]; then + if [ ! -d $SOURCE/build/webkitbuilds/cache/mac/0.9.3 ]; then + mkdir -p $SOURCE/build/webkitbuilds/cache/mac/0.9.3/node-webkit.app + pushd $SOURCE/build/webkitbuilds/cache/mac/0.9.3 + curl -O http://dl.node-webkit.org/v0.9.3/node-webkit-v0.9.3-pre8-osx-ia32.zip + unzip node-webkit-v0.9.3-pre8-osx-ia32.zip + popd + fi + + DEST="$SOURCE/build/Cloud9-dev.app" + RES="$DEST/Contents/Resources" + + rm -rf "$DEST" + mkdir -p "$RES/app.nw" + + cp -R $SOURCE/build/webkitbuilds/cache/mac/0.9.3/node-webkit.app/* $DEST + cat $SOURCE/local/Info.plist | sed "s/Cloud9/Cloud9-dev/" > $DEST/Contents/Info.plist + # TODO add blue icon for dev mode + # rm $DEST/Contents/Resources/nw.icns + cp $SOURCE/build/osx/c9.icns $DEST/Contents/Resources/nw.icns + + node --eval " + var path = require('path') + var p = require('./local/package.json'); + p.main = path.relative('$RES/app.nw', '$SOURCE/local/projectManager.html'); + delete p.dependencies; + // p.window.icon = 'icon.png'; + console.log(JSON.stringify(p, null, 2)); + " > $RES/app.nw/package.json + + echo dev app created in build/Cloud9-dev.app/Contents/MacOS/node-webkit +fi + +if [ "$os" == "windows" ]; then + NODE_VERSION=v0.10.25 + NW_VERSION=v0.9.2 + + pushd build + if [ ! -f node.exe ]; then + echo "downloading node" + curl -O http://nodejs.org/dist/$NODE_VERSION/node.exe + fi + if [ ! -f node-webkit-$NW_VERSION-win-ia32.zip ]; then + echo "downloading node-webkit" + curl -O http://dl.node-webkit.org/$NW_VERSION/node-webkit-$NW_VERSION-win-ia32.zip + fi + + dest=win32-dev/bin + mkdir -p $dest + + unzip node-webkit-$NW_VERSION-win-ia32.zip -d $dest + cp node.exe $dest + mv $dest/nw.exe $dest/Cloud9.exe + + cp win32/icon.png $dest + + # cp -Rf win32/deps win32/bin/deps + + node --eval ' + var p=require("../local/package.json"); + p.main = "../../../local/projectManager.html"; + delete p.dependencies; + p.window.icon = "icon.png"; + console.log(JSON.stringify(p, null, 2)); + ' > $dest/package.json + popd fi -DEST="$SOURCE/build/Cloud9-dev.app" -RES="$DEST/Contents/Resources" -rm -rf "$DEST" -mkdir -p "$RES/app.nw" -cp -R $SOURCE/build/webkitbuilds/cache/mac/0.9.3/node-webkit.app/* $DEST -cat $SOURCE/local/Info.plist | sed "s/Cloud9/Cloud9-dev/" > $DEST/Contents/Info.plist -# TODO add blue icon for dev mode -# rm $DEST/Contents/Resources/nw.icns -cp $SOURCE/build/osx/c9.icns $DEST/Contents/Resources/nw.icns - -node --eval " - var path = require('path') - var p = require('./local/package.json'); - p.main = path.relative('$RES/app.nw', '$SOURCE/local/projectManager.html'); - delete p.dependencies; - // p.window.icon = 'icon.png'; - console.log(JSON.stringify(p, null, 2)); -" > $RES/app.nw/package.json - -echo dev app created in build/Cloud9-dev.app/Contents/MacOS/node-webkit \ No newline at end of file