diff options
| author |  Trevor Elliott <trevor@galois.com> | 2013-06-07 11:59:57 -0700 |
|---|---|---|
| committer | Trevor Elliott <trevor@galois.com> | 2013-06-07 11:59:57 -0700 |
| commit | 8690d56ff0bbd1031e8cc6788dd2159aac6b7adb (patch) | |
| tree | d573336305dc756f357f20dd986f77cb3ceafb9b /Makefile | |
| parent | f42930c2226d07482725b03ad522c106c0bdec8b (diff) | |
Reorganize the build system
* Move all javascript source to src/js
* Update the test runner, etc.
* Do less javascript compilation
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 5 insertions, 14 deletions
@@ -59,7 +59,11 @@ clean:: # Subdirs ###################################################################### -$(eval $(call subdir,contexts)) +$(eval $(call subdir,src/js/fiveui)) +$(eval $(call subdir,src/js/chrome)) +$(eval $(call subdir,src/js/firefox)) +$(eval $(call subdir,src/js/tests)) + $(eval $(call subdir,profiles)) $(eval $(call subdir,doc)) @@ -92,16 +96,3 @@ test: fiveui.crx fiveui.xpi $(topdir)/profiles/chrome $(topdir)/profiles/firefox cd $(HEADLESS_DIR) && $(MVN_TEST_CMD) endif - - -# JS Unit Tests ############################################################### - -ifneq "$(PHANTOM_EXE)" "" - -test: test-js -test-js: - cd $(topdir)/contexts/data && $(PHANTOM_EXE) \ - lib/phantomjs_jasmine/phantomjs_jasminexml_runner.js \ - tests/PhantomJSJasmineRunner.html tests/reports/ - -endif |