[Pkg-mozext-commits] [requestpolicy] 202/280: Makefile: add `moz_xpi` option

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 480ae7b66e945a78ce4716d27c00c7b61c375152
Author: Martin Kimmerle <dev at 256k.de>
Date:   Mon Feb 2 07:51:24 2015 +0100

    Makefile: add `moz_xpi` option
    
    With that option, the user can specify a custom XPI file of
    RequestPolicy, which will be used for the "run" and "mozmill"
    targets.
---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index dc08c9d..4a80bb6 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,9 @@ jar_file := $(build_path)chrome/$(extension_name).jar
 xpi_file := $(dist_path)$(extension_name).xpi
 signed_xpi_file := $(dist_path)$(extension_name)-signed.xpi
 
+# the default XPI to use for mozrunner and mozmill
+moz_xpi := $(xpi_file)
+
 # select the default app. Can be overridden e.g. via `make run app='seamonkey'`
 app := firefox
 # default app branch
@@ -169,13 +172,13 @@ $(deleted_files): FORCE
 #
 
 # arguments for mozrunner
-mozrunner_args := -a $(xpi_file)
+mozrunner_args := -a $(moz_xpi)
 mozrunner_args += -b $(app_binary)
 mozrunner_args += --preferences=$(mozrunner_prefs_ini):dev
 mozrunner_args += $(moz_args)
 
 .PHONY: run
-run: $(xpi_file)
+run: $(moz_xpi)
 	mozrunner $(mozrunner_args)
 
 
@@ -195,8 +198,8 @@ mm_manifest := manifest.ini
 .PHONY: check test mozmill
 check test: mozmill
 
-mozmill: $(xpi_file)
-	mozmill -a $(xpi_file) -b $(app_binary) \
+mozmill: $(moz_xpi)
+	mozmill -a $(moz_xpi) -b $(app_binary) \
 		-m $(mozmill_requestpolicy_test_path)$(mm_manifest)
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git