From 9d7a05feac7d66df79052c28385ca2a93fab7bf7 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Tue, 25 Feb 2014 18:14:49 -0500 Subject: moar bleh --- .travis.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to '.travis.sh') diff --git a/.travis.sh b/.travis.sh index 64cfb8e..454c4d5 100755 --- a/.travis.sh +++ b/.travis.sh @@ -2,6 +2,8 @@ set -e -x +MAKEOPTS="-j`nproc` ${MAKEOPTS}" + case "$1" in before_install) sudo service postgresql stop @@ -18,8 +20,6 @@ case "$1" in mv *.rpyc unrpyc ;; install) - MAKEOPTS="-j`nproc` ${MAKEOPTS}" - sudo apt-get install -q libtheora-dev libvpx-dev libx264-dev yasm cd libwebp-0.4.0 @@ -34,8 +34,9 @@ case "$1" in cd node-v* ./configure --openssl-use-sys --shared-zlib - make V= $MAKEOPTS - sudo make V= $MAKEOPTS install + # TO NODE DEVS: "quiet" DOESN'T MEAN WHAT YOU THINK IT MEANS + make $MAKEOPTS >/dev/null + sudo make $MAKEOPTS install >/dev/null cd .. sudo npm install -g uglify-js @@ -61,6 +62,9 @@ case "$1" in curl https://raw.github.com/Lattyware/unrpa/master/unrpa | python2 - -p www/dump -m data.rpa rm data.rpa ;; + script) + exec make + ;; *) exit 1 esac -- cgit v1.2.3-54-g00ecf