Skip to content

Commit 1300c37

Browse files
author
Dane Springmeyer
committed
attempt to fix TryGhost#325 
1 parent ec657a7 commit 1300c37

2 files changed

Lines changed: 8 additions & 33 deletions

File tree

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ os:
77

88
env:
99
matrix:
10-
- NODE_VERSION="0.8"
11-
- NODE_VERSION="0.10"
12-
- NODE_VERSION="0.11"
10+
#- NODE_VERSION="0.8"
11+
#- NODE_VERSION="0.10"
12+
#- NODE_VERSION="0.11"
1313
- NODE_WEBKIT="0.8.6" TARGET_ARCH="ia32"
14-
- NODE_WEBKIT="0.8.6" TARGET_ARCH="x64"
15-
- NODE_WEBKIT="0.10.1" TARGET_ARCH="ia32"
16-
- NODE_WEBKIT="0.10.1" TARGET_ARCH="x64"
14+
#- NODE_WEBKIT="0.8.6" TARGET_ARCH="x64"
15+
#- NODE_WEBKIT="0.10.1" TARGET_ARCH="ia32"
16+
#- NODE_WEBKIT="0.10.1" TARGET_ARCH="x64"
1717
global:
1818
- secure: QhuP5E/kYL1j1KDkHGJtk6DSJr1RH4DR/JrC62Viuf5Du8jE+i0kPWfF2MxtuEmKo35orhpu8t8mzKygWfuO63WPuuIE9qd/+V/y99Lqcj0tEN6wJ5RnywktbTJWg23zphjhmYq3Xj8DLVEikCZBwHtlbygkO9Q60cn1PK+bnPg=
1919
- secure: HxCS2dQAWI0KmCFnFNNZoucG4FeAW+itG7+Hp0dNtwmxZzGOZYFO2bZcGvTAMNfVN++oqLxTebYQI1oB5yUl5mPJjrjthaGS6Zq3S6rfJcXiv+icYgEXlR6ejQ97dsHw1Jeg8nedCQlI4kHfvG6pgBLhq9hnugxH1Cjhdt14E9U=

‎scripts/build_against_node_webkit.sh‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ if [[ $(uname -s) == 'Darwin' ]]; then
3232
export PATH=$(pwd)/node-webkit.app/Contents/MacOS/:${PATH}
3333
# v0.10.0-rc1 unzips with extra folder
3434
export PATH=$(pwd)/${NW_DOWNLOAD}/node-webkit.app/Contents/MacOS/:${PATH}
35-
3635
npm install --build-from-source ${GYP_ARGS}
3736
else
3837
# Linux
@@ -43,35 +42,11 @@ else
4342
wget http://dl.node-webkit.org/v${NODE_WEBKIT}/${NW_DOWNLOAD}.tar.gz
4443
tar xf ${NW_DOWNLOAD}.tar.gz
4544
export PATH=$(pwd)/${NW_DOWNLOAD}:${PATH}
46-
if [[ '${TARGET_ARCH}' == 'ia32' ]]; then
45+
if [[ "${TARGET_ARCH}" == 'ia32' ]]; then
4746
# prepare packages for 32-bit builds on Linux
48-
sudo apt-get -y install gcc-multilib
49-
sudo apt-get -y install g++-multilib
50-
# prepare packages for 32-bit node-webkit on Linux
51-
sudo apt-get -y install libx11-6:i386
52-
sudo apt-get -y install libxtst6:i386
53-
sudo apt-get -y install libcap2:i386
54-
sudo apt-get -y install libglib2.0-0:i386
55-
sudo apt-get -y install libgtk2.0-0:i386
56-
sudo apt-get -y install libatk1.0-0:i386
57-
sudo apt-get -y install libgdk-pixbuf2.0-0:i386
58-
sudo apt-get -y install libcairo2:i386
59-
sudo apt-get -y install libfreetype6:i386
60-
sudo apt-get -y install libfontconfig1:i386
61-
sudo apt-get -y install libxcomposite1:i386
62-
sudo apt-get -y install libasound2:i386
63-
sudo apt-get -y install libxdamage1:i386
64-
sudo apt-get -y install libxext6:i386
65-
sudo apt-get -y install libxfixes3:i386
66-
sudo apt-get -y install libnss3:i386
67-
sudo apt-get -y install libnspr4:i386
68-
sudo apt-get -y install libgconf-2-4:i386
69-
sudo apt-get -y install libexpat1:i386
70-
sudo apt-get -y install libdbus-1-3:i386
71-
sudo apt-get -y install libudev0:i386
47+
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
7248
# also use ldd to find out if some necessary apt-get is missing
7349
ldd $(pwd)/${NW_DOWNLOAD}/nw
74-
7550
CC=gcc-4.6 CXX=g++-4.6 npm install --build-from-source ${GYP_ARGS}
7651
else
7752
npm install --build-from-source ${GYP_ARGS}

0 commit comments

Comments
 (0)