[Pkg-mozext-commits] [requestpolicy] 06/65: [rem] Makefile: mozmill is no longer in use

[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 86ffb87abb419e1f43a55c3bcc5699565351832f
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Jan 5 06:26:15 2016 +0100

    [rem] Makefile: mozmill is no longer in use
---
 Makefile | 57 ++++++---------------------------------------------------
 1 file changed, 6 insertions(+), 51 deletions(-)

diff --git a/Makefile b/Makefile
index 1893600..e120a29 100644
--- a/Makefile
+++ b/Makefile
@@ -187,11 +187,11 @@ dummy_ext__src__all_files := $(shell find $(dummy_ext__source_dirname) -type f -
 dummy_ext__xpi_file := $(dist_path)dummy-ext.xpi
 
 
-# ______________________________
-# vars for mozrunner and mozmill
+# __________________
+# vars for mozrunner
 #
 
-# the default XPI to use for mozrunner and mozmill
+# the default XPI to use for mozrunner
 moz_xpi := $(unit_testing__xpi_file)
 
 # select the default app. Can be overridden e.g. via `make run app='seamonkey'`
@@ -420,7 +420,7 @@ $(rp_deleted_files): FORCE
 # for running and unit-testing
 #
 
-.PHONY: venv venv-mozmill
+.PHONY: venv
 
 venv: .venv/bin/activate
 .venv/bin/activate: requirements.txt
@@ -434,17 +434,6 @@ venv: .venv/bin/activate
 	touch --no-create .venv/bin/activate ; \
 	)
 
-# mozmill needs a separate venv
-#   ( because it uses '==' package dependencies instead of '>='
-#     see https://github.com/mozilla/mozmill/blob/2.0.10/mozmill/setup.py#L11 )
-venv-mozmill: .venv-mozmill/bin/activate
-.venv-mozmill/bin/activate:
-	test -d .venv-mozmill || virtualenv --prompt='(RP/mozmill)' .venv-mozmill
-	( \
-	source .venv-mozmill/bin/activate ; \
-	pip install mozmill ; \
-	)
-
 # ___________
 # run firefox
 #
@@ -470,42 +459,8 @@ run: venv $(moz_xpi) $(dev_helper__xpi_file)
 # Note: currently you have to do some setup before this will work.
 # see https://github.com/RequestPolicyContinued/requestpolicy/wiki/Setting-up-a-development-environment#unit-tests-for-requestpolicy
 
-mozmill_tests_dir := .mozilla/mozmill-tests
-mozmill_rpc_test_dir := $(mozmill_tests_dir)/firefox/tests/addons/rpcontinued at requestpolicy.org
-
-# Default mozmill manifest to use for testing
-mm_manifest := manifest.ini
-
-.PHONY: check test mozmill marionette mozmill-dirs
-check test: mozmill marionette
-
-mozmill: venv-mozmill $(moz_xpi) $(dev_helper__xpi_file) mozmill-dirs
-	( \
-	source .venv-mozmill/bin/activate ; \
-	mozmill -a $(moz_xpi) -a $(dev_helper__xpi_file) -b $(app_binary) \
-		-m $(mozmill_rpc_test_dir)/$(mm_manifest) $(moz_args) ; \
-	)
-
-
-
-mozmill-dirs: $(mozmill_tests_dir) \
-	$(mozmill_rpc_test_dir) \
-	$(mozmill_rpc_test_dir)/mozmill-tests \
-	$(mozmill_rpc_test_dir)/data
-
-$(mozmill_rpc_test_dir): $(mozmill_tests_dir)
-	@test -L $@ \
-	|| ln -ns ../../../../../tests/mozmill $@
-
-$(mozmill_rpc_test_dir)/mozmill-tests: $(mozmill_rpc_test_dir)
-	@test -L tests/mozmill/mozmill-tests \
-	|| ln -ns ../../$(mozmill_tests_dir) tests/mozmill/mozmill-tests
-
-$(mozmill_rpc_test_dir)/data: $(mozmill_rpc_test_dir)
-	@test -L tests/mozmill/data \
-	|| ln -ns ../../ tests/mozmill/data
-
-
+.PHONY: check test marionette
+check test: marionette
 
 marionette_tests := tests/marionette/rp_puppeteer/tests/manifest.ini
 marionette_tests += tests/marionette/tests/manifest.ini

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