Commit 5b7e2515 by Dane Springmeyer

more fixes

parent 9bda7842
...@@ -41,6 +41,8 @@ else ...@@ -41,6 +41,8 @@ else
fi fi
npm test npm test
platform=$(uname -s | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/")
if [[ $(uname -s) == 'Linux' ]]; then if [[ $(uname -s) == 'Linux' ]]; then
sudo apt-get -y install gcc-multilib g++-multilib; fi sudo apt-get -y install gcc-multilib g++-multilib; fi
# node v0.8 and above provide pre-built 32 bit and 64 bit binaries # node v0.8 and above provide pre-built 32 bit and 64 bit binaries
......
...@@ -15,15 +15,17 @@ npm --version ...@@ -15,15 +15,17 @@ npm --version
export DISPLAY=:99.0 export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start +extension RANDR sh -e /etc/init.d/xvfb start +extension RANDR
npm install nw-gyp npm install nw-gyp
node-pre-gyp rebuild --runtime=node-webkit --target=$NODE_WEBKIT
# now we need node-webkit itself to test
OLD_PATH="$PATH" OLD_PATH="$PATH"
if [[ $(uname -s) == 'Darwin' ]]; then if [[ $(uname -s) == 'Darwin' ]]; then
npm install --build-from-source --target_arch=ia32 --runtime=node-webkit --target=$NODE_WEBKIT
export NW_DOWNLOAD=node-webkit-v${NODE_WEBKIT}-osx-ia32 export NW_DOWNLOAD=node-webkit-v${NODE_WEBKIT}-osx-ia32
wget http://dl.node-webkit.org/v${NODE_WEBKIT}/${NW_DOWNLOAD}.tar.gz wget http://dl.node-webkit.org/v${NODE_WEBKIT}/${NW_DOWNLOAD}.tar.gz
unzip ${NW_DOWNLOAD}.zip unzip ${NW_DOWNLOAD}.zip
export PATH=$(pwd)/${NW_DOWNLOAD}:$PATH export PATH=$(pwd)/${NW_DOWNLOAD}:$PATH
else else
npm install --build-from-source --runtime=node-webkit --target=$NODE_WEBKIT
export NW_DOWNLOAD=node-webkit-v${NODE_WEBKIT}-linux-x64 export NW_DOWNLOAD=node-webkit-v${NODE_WEBKIT}-linux-x64
wget http://dl.node-webkit.org/v${NODE_WEBKIT}/${NW_DOWNLOAD}.tar.gz wget http://dl.node-webkit.org/v${NODE_WEBKIT}/${NW_DOWNLOAD}.tar.gz
tar xf ${NW_DOWNLOAD}.tar.gz tar xf ${NW_DOWNLOAD}.tar.gz
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment