From d657e80429b4ea758316dc0a307afd2b480e45e4 Mon Sep 17 00:00:00 2001 From: Trevor Elliott Date: Mon, 3 Jun 2013 15:23:20 -0700 Subject: Add a Config.mk for build config --- .gitignore | 2 ++ Config.mk.sample | 2 ++ Makefile | 14 +++++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 Config.mk.sample diff --git a/.gitignore b/.gitignore index 2df4638..d657933 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ chromedriver.log fiveui.crx fiveui.xpi contexts/data/tests/reports + +Config.mk diff --git a/Config.mk.sample b/Config.mk.sample new file mode 100644 index 0000000..ff4044d --- /dev/null +++ b/Config.mk.sample @@ -0,0 +1,2 @@ + +PHANTOM_EXE ?= $(shell which phantomjs 2>/dev/null) diff --git a/Makefile b/Makefile index 1496ac9..2b57dfe 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,13 @@ path := . include mk/util.mk include mk/subdir.mk +ifeq "$(shell ls ./Config.mk 2>/dev/null)" "" +$(warning No Config.mk found, installing a default) +Config.mk: Config.mk.sample + $(call cmd,cp) + +endif +-include Config.mk # Build Directory Staging ###################################################### @@ -89,10 +96,11 @@ endif # JS Unit Tests ############################################################### -PHANTOM_EXE := $(shell which phantomjs 2>/dev/null) -ifneq "$PHANTOM_EXE" "" +ifneq "$(PHANTOM_EXE)" "" test-js: - cd $(topdir)/contexts/data && $(PHANTOM_EXE) lib/phantomjs_jasmine/phantomjs_jasminexml_runner.js tests/PhantomJSJasmineRunner.html tests/reports/ + cd $(topdir)/contexts/data && $(PHANTOM_EXE) \ + lib/phantomjs_jasmine/phantomjs_jasminexml_runner.js \ + tests/PhantomJSJasmineRunner.html tests/reports/ endif -- cgit v1.2.3