diff options
| author |  Rogan Creswick <creswick@gmail.com> | 2013-06-05 13:49:11 -0700 |
|---|---|---|
| committer | Rogan Creswick <creswick@gmail.com> | 2013-06-05 13:49:11 -0700 |
| commit | aeb7137a56284b7fe4be29989ea172f3bd56da3b (patch) | |
| tree | c6d27e5a948eab66772c1dae1ad8569e8b6d4ae8 /Makefile | |
| parent | 95ecebd9cf80e06342ea1acef1da8bbadbce9208 (diff) | |
updated documentation, bulid files, and removed an old gitignore file
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -67,7 +67,7 @@ $(eval $(call subdir,doc)) # Maven Packages ############################################################### # Don't try to run any of this if maven isn't installed -MVN_EXE := $(shell which --skip-alias $i mvn 2>/dev/null) +MVN_EXE := $(shell which mvn 2>/dev/null) ifneq "$(MVN_EXE)" "" # package/install various maven sub-projects @@ -86,8 +86,8 @@ TEST_RUNNER_DIR := testrunner HEADLESS_DIR := headless RSTESTER_DIR := rsTester -test: chromeExtension profile-chrome profile-firefox ffExtension pkg-rsTester - cd $(TEST_RUNNER_DIR) && $(MVN_TEST_CMD) +test: fiveui.crx fiveui.xpi $(topdir)/profiles/chrome $(topdir)/profiles/firefox pkg-rsTester +# cd $(TEST_RUNNER_DIR) && $(MVN_TEST_CMD) cd $(RSTESTER_DIR) && $(MVN_TEST_CMD) cd $(HEADLESS_DIR) && $(MVN_TEST_CMD) @@ -98,6 +98,7 @@ endif ifneq "$(PHANTOM_EXE)" "" +test: test-js test-js: cd $(topdir)/contexts/data && $(PHANTOM_EXE) \ lib/phantomjs_jasmine/phantomjs_jasminexml_runner.js \ |