From 9f1ae2a545514dfe6a38bf072106b92d9f21d09f Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 4 Aug 2013 17:21:37 +0200 Subject: dont install phantomjs from npm --- .travis.yml | 2 +- bin/updater.py | 1 + js/Makefile | 2 +- js/package.json | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f885102bd..8bca249f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,5 @@ before_install: script: - sudo add-apt-repository -y ppa:chris-lea/node.js - sudo apt-get update - - sudo apt-get -y install nodejs + - sudo apt-get -y install nodejs phantomjs - make unit-tests && make javascript-tests diff --git a/bin/updater.py b/bin/updater.py index 7084285f6..669324f58 100644 --- a/bin/updater.py +++ b/bin/updater.py @@ -27,6 +27,7 @@ import sys import time import json import argparse +import queue import urllib.request import urllib.error diff --git a/js/Makefile b/js/Makefile index f9cf87dec..4dd1a16e9 100644 --- a/js/Makefile +++ b/js/Makefile @@ -20,7 +20,7 @@ firefox_bin=/usr/bin/firefox chrome_bin=/usr/bin/chromium coffee=$(CURDIR)/node_modules/coffee-script/bin/coffee grunt=$(CURDIR)/node_modules/grunt-cli/bin/grunt -phantomjs=$(CURDIR)/node_modules/phantomjs/bin/phantomjs +phantomjs=/usr/bin/phantomjs all: compile diff --git a/js/package.json b/js/package.json index 9c7bf2dda..0677f0e31 100644 --- a/js/package.json +++ b/js/package.json @@ -24,7 +24,6 @@ "grunt-coffeelint": "*", "grunt-karma": "*", "grunt-wrap": "*", - "phantomjs": "*", "grunt-phpunit": "*" }, "engine": "node >= 0.8" -- cgit v1.2.3