diff options
author | Trevor Elliott <trevor@galois.com> | 2013-06-03 15:23:20 -0700 |
---|---|---|
committer | Trevor Elliott <trevor@galois.com> | 2013-06-03 15:23:20 -0700 |
commit | d657e80429b4ea758316dc0a307afd2b480e45e4 (patch) | |
tree | ea165808e57c9594b7cace307f0b2d5f577c3567 | |
parent | b2e6343765872d981122b358afd76d81403c4240 (diff) |
Add a Config.mk for build config
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Config.mk.sample | 2 | ||||
-rw-r--r-- | Makefile | 14 |
3 files changed, 15 insertions, 3 deletions
@@ -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) @@ -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 |