[Pkg-mozext-commits] [requestpolicy] 173/280: add Makefile option `fx_branch`

[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 95d3c0c844f7ed46ef8f0a5c79cadec18639bb6d
Author: Martin Kimmerle <dev at 256k.de>
Date:   Fri Jan 23 15:57:30 2015 +0100

    add Makefile option `fx_branch`
    
    example: `make run fx_branch='release'`
---
 Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3dea399..e2db212 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,12 @@ jar_file := $(build_path)chrome/$(extension_name).jar
 xpi_file := $(dist_path)$(extension_name).xpi
 signed_xpi_file := $(dist_path)$(extension_name)-signed.xpi
 
-binary_firefox_nightly := .mozilla/software/firefox/nightly/firefox
+# It's possible to pass the manifest file `mm_manifest` to make
+ifndef fx_branch
+## default value
+fx_branch := nightly
+endif
+binary_firefox := .mozilla/software/firefox/$(fx_branch)/firefox
 mozrunner_prefs_ini := tests/mozrunner-prefs.ini
 
 
@@ -161,7 +166,7 @@ $(deleted_files): FORCE
 
 .PHONY: run
 run: $(xpi_file)
-	mozrunner -a $(xpi_file) -b $(binary_firefox_nightly) \
+	mozrunner -a $(xpi_file) -b $(binary_firefox) \
 		--preferences=$(mozrunner_prefs_ini):dev
 
 
@@ -185,7 +190,7 @@ endif
 check test: mozmill
 
 mozmill: $(xpi_file)
-	mozmill -a $(xpi_file) -b $(binary_firefox_nightly) \
+	mozmill -a $(xpi_file) -b $(binary_firefox) \
 		-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