aboutsummaryrefslogtreecommitdiff
path: root/src/js/firefox
diff options
context:
space:
mode:
authorGravatar Trevor Elliott <trevor@galois.com>2013-06-07 16:42:11 -0700
committerGravatar Trevor Elliott <trevor@galois.com>2013-06-07 16:48:17 -0700
commit8b5d3c6b75744cf5938f253d20f367999e92b1a7 (patch)
treeb516a82c5b198fd080d265e56b3edf19d1180f10 /src/js/firefox
parentf37588f9a4c7c6b418c64f03d82d48ecd14da217 (diff)
Remove the addon-sdk from the repo, and download it on demand
Diffstat (limited to 'src/js/firefox')
-rw-r--r--src/js/firefox/build.mk12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/js/firefox/build.mk b/src/js/firefox/build.mk
index 4696930..6d2e20a 100644
--- a/src/js/firefox/build.mk
+++ b/src/js/firefox/build.mk
@@ -69,14 +69,6 @@ $(firefox-build)/data/main.js: \
# Packaging ####################################################################
-addon-sdk := $(topdir)/tools/addon-sdk
-
-# wrapper for setting up the environment for the running the cfx command
-cfx = ( cd $(addon-sdk) $(redir) && \
- . bin/activate $(redir) && \
- cd $1 $(redir) && \
- cfx $2 $(redir) )
-
.PHONY: stage-firefox
stage-firefox: \
$(firefox-build)/package.json \
@@ -90,7 +82,7 @@ stage-firefox: \
$(firefox-build)/data/icons/options-icon.js \
| $(firefox-build)
-$(build-dir)/firefox.xpi: stage-firefox
+$(build-dir)/firefox.xpi: stage-firefox $(addon-sdk-unpacked)
$(call label,XPI $(call drop-prefix,$@))\
$(call cfx,$(build-dir),xpi -p $(topdir)/profiles/firefox \
--pkgdir=$(firefox-build) )
@@ -98,5 +90,5 @@ $(build-dir)/firefox.xpi: stage-firefox
# Testing ######################################################################
-run-firefox: stage-firefox
+run-firefox: stage-firefox $(addon-sdk-unpacked)
$(call label,RUNFF)$(call cfx,$(firefox-build),run)