diff options
| author |  Benjamin Jones <bjones@galois.com> | 2013-06-11 14:14:30 -0700 |
|---|---|---|
| committer | Benjamin Jones <bjones@galois.com> | 2013-06-11 14:14:30 -0700 |
| commit | 2f432d2b309b0896a309b727c6e95e5cf91b2ea4 (patch) | |
| tree | a54cebfe2a883d4000d4216d5e09f4caf17c7d46 | |
| parent | 19824d277dcaa04c3583b7dac15c5a4e9abf5810 (diff) | |
changed test target to depend only on fiveui.xpi
fixed references to firefox.xpi
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/batchtools/build.mk | 2 | ||||
| -rw-r--r-- | src/js/firefox/build.mk | 4 |
3 files changed, 3 insertions, 5 deletions
@@ -37,7 +37,7 @@ clean:: distclean:: clean .PHONY: test -test: package +test: # Utilities #################################################################### diff --git a/src/batchtools/build.mk b/src/batchtools/build.mk index 06239d6..d772607 100644 --- a/src/batchtools/build.mk +++ b/src/batchtools/build.mk @@ -9,9 +9,7 @@ test: test-batchtools .PHONY: test-batchtools test-batchtools: \ - $(build-dir)/fiveui.crx \ $(build-dir)/fiveui.xpi \ - $(topdir)/profiles/chrome \ $(topdir)/profiles/firefox $(call label,BATCHTEST)(cd $(batchtools-dir) \ && xvfb-run -a $(maven-cmd) test) diff --git a/src/js/firefox/build.mk b/src/js/firefox/build.mk index 9f1caa8..1807a45 100644 --- a/src/js/firefox/build.mk +++ b/src/js/firefox/build.mk @@ -3,7 +3,7 @@ all: stage-firefox -package: $(build-dir)/firefox.xpi +package: $(build-dir)/fiveui.xpi firefox-dir := $(path) @@ -85,7 +85,7 @@ stage-firefox: \ $(firefox-build)/data/icons/options-icon.js \ | $(firefox-build) -$(build-dir)/firefox.xpi: \ +$(build-dir)/fiveui.xpi: \ stage-firefox \ $(addon-sdk-unpacked) \ $(topdir)/profiles/firefox |