Commit 1300c376 by Dane Springmeyer

attempt to fix #325

parent ec657a73
......@@ -7,13 +7,13 @@ os:
env:
matrix:
- NODE_VERSION="0.8"
- NODE_VERSION="0.10"
- NODE_VERSION="0.11"
#- NODE_VERSION="0.8"
#- NODE_VERSION="0.10"
#- NODE_VERSION="0.11"
- NODE_WEBKIT="0.8.6" TARGET_ARCH="ia32"
- NODE_WEBKIT="0.8.6" TARGET_ARCH="x64"
- NODE_WEBKIT="0.10.1" TARGET_ARCH="ia32"
- NODE_WEBKIT="0.10.1" TARGET_ARCH="x64"
#- NODE_WEBKIT="0.8.6" TARGET_ARCH="x64"
#- NODE_WEBKIT="0.10.1" TARGET_ARCH="ia32"
#- NODE_WEBKIT="0.10.1" TARGET_ARCH="x64"
global:
- secure: QhuP5E/kYL1j1KDkHGJtk6DSJr1RH4DR/JrC62Viuf5Du8jE+i0kPWfF2MxtuEmKo35orhpu8t8mzKygWfuO63WPuuIE9qd/+V/y99Lqcj0tEN6wJ5RnywktbTJWg23zphjhmYq3Xj8DLVEikCZBwHtlbygkO9Q60cn1PK+bnPg=
- secure: HxCS2dQAWI0KmCFnFNNZoucG4FeAW+itG7+Hp0dNtwmxZzGOZYFO2bZcGvTAMNfVN++oqLxTebYQI1oB5yUl5mPJjrjthaGS6Zq3S6rfJcXiv+icYgEXlR6ejQ97dsHw1Jeg8nedCQlI4kHfvG6pgBLhq9hnugxH1Cjhdt14E9U=
......
......@@ -32,7 +32,6 @@ if [[ $(uname -s) == 'Darwin' ]]; then
export PATH=$(pwd)/node-webkit.app/Contents/MacOS/:${PATH}
# v0.10.0-rc1 unzips with extra folder
export PATH=$(pwd)/${NW_DOWNLOAD}/node-webkit.app/Contents/MacOS/:${PATH}
npm install --build-from-source ${GYP_ARGS}
else
# Linux
......@@ -43,35 +42,11 @@ else
wget http://dl.node-webkit.org/v${NODE_WEBKIT}/${NW_DOWNLOAD}.tar.gz
tar xf ${NW_DOWNLOAD}.tar.gz
export PATH=$(pwd)/${NW_DOWNLOAD}:${PATH}
if [[ '${TARGET_ARCH}' == 'ia32' ]]; then
if [[ "${TARGET_ARCH}" == 'ia32' ]]; then
# prepare packages for 32-bit builds on Linux
sudo apt-get -y install gcc-multilib
sudo apt-get -y install g++-multilib
# prepare packages for 32-bit node-webkit on Linux
sudo apt-get -y install libx11-6:i386
sudo apt-get -y install libxtst6:i386
sudo apt-get -y install libcap2:i386
sudo apt-get -y install libglib2.0-0:i386
sudo apt-get -y install libgtk2.0-0:i386
sudo apt-get -y install libatk1.0-0:i386
sudo apt-get -y install libgdk-pixbuf2.0-0:i386
sudo apt-get -y install libcairo2:i386
sudo apt-get -y install libfreetype6:i386
sudo apt-get -y install libfontconfig1:i386
sudo apt-get -y install libxcomposite1:i386
sudo apt-get -y install libasound2:i386
sudo apt-get -y install libxdamage1:i386
sudo apt-get -y install libxext6:i386
sudo apt-get -y install libxfixes3:i386
sudo apt-get -y install libnss3:i386
sudo apt-get -y install libnspr4:i386
sudo apt-get -y install libgconf-2-4:i386
sudo apt-get -y install libexpat1:i386
sudo apt-get -y install libdbus-1-3:i386
sudo apt-get -y install libudev0:i386
sudo apt-get -y install gcc-multilib g++-multilib libx11-6:i386 libxtst6:i386 libcap2:i386 libglib2.0-0:i386 libgtk2.0-0:i386 libatk1.0-0:i386 libgdk-pixbuf2.0-0:i386 libcairo2:i386 libfreetype6:i386 libfontconfig1:i386 libxcomposite1:i386 libasound2:i386 libxdamage1:i386 libxext6:i386 libxfixes3:i386 libnss3:i386 libnspr4:i386 libgconf-2-4:i386 libexpat1:i386 libdbus-1-3:i386 libudev0:i386
# also use ldd to find out if some necessary apt-get is missing
ldd $(pwd)/${NW_DOWNLOAD}/nw
CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source ${GYP_ARGS}
else
npm install --build-from-source ${GYP_ARGS}
......
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