[Pkg-mozext-commits] [requestpolicy] 03/280: don't use internal jar files anymore

David Prévot taffit at moszumanska.debian.org
Sat May 2 20:29:53 UTC 2015


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

taffit pushed a commit to branch master
in repository requestpolicy.

commit f8b83ff74f7974a04e4dd7f579dfa14d5582b7d9
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Nov 25 03:08:16 2014 +0100

    don't use internal jar files anymore
---
 Makefile                      | 23 ++++-------------------
 src/chrome.manifest.devel     | 38 --------------------------------------
 src/chrome.manifest.packaging | 38 --------------------------------------
 3 files changed, 4 insertions(+), 95 deletions(-)

diff --git a/Makefile b/Makefile
index 39e03e5..b272098 100644
--- a/Makefile
+++ b/Makefile
@@ -42,18 +42,14 @@ source_files := $(shell find $(source_dirname) -type f -regex ".*\.jsm?") \
 all_files := $(patsubst $(source_path)%,$(build_path)%,$(source_files))
 
 javascript_files := $(filter %.js %.jsm,$(all_files))
-chrome_manifest := $(filter %chrome.manifest,$(all_files))
-other_files := $(filter-out $(javascript_files) $(chrome_manifest),$(all_files))
-
-all_files_inside_jar := $(filter $(build_path)content/% $(build_path)locale/% $(build_path)skin/%,$(all_files))
-all_files_outside_jar := $(filter-out $(all_files_inside_jar),$(all_files))
+other_files := $(filter-out $(javascript_files),$(all_files))
 
 # detect deleted files and empty directories
 deleted_files :=
 empty_dirs :=
 ifneq "$(wildcard $(build_path))" ""
 # files that have been deleted but still exist in the build directory.
-deleted_files := $(shell find $(build_path) -type f | grep -F -v $(addprefix -e ,$(all_files) $(jar_file)))
+deleted_files := $(shell find $(build_path) -type f | grep -F -v $(addprefix -e ,$(all_files)))
 # empty directories. -mindepth 1 to exclude the build directory itself.
 empty_dirs := $(shell find $(build_path) -mindepth 1 -type d -empty)
 endif
@@ -90,19 +86,13 @@ dist: $(xpi_file)
 # Note: We add the build path as a prerequisite, not the phony "build" target.
 #       This way we avoid re-packaging in case nothing has changed.
 #       Also $(all_files) is needed as prerequisite, so that the xpi gets updated
-$(xpi_file): $(build_path) $(jar_file) $(all_files) | $(dist_path)
+$(xpi_file): $(build_path) $(all_files) | $(dist_path)
 	@rm -f $(xpi_file)
 	@echo "Creating XPI file."
 	@cd $(build_path) && \
-	$(ZIP) $(abspath $(xpi_file)) $(patsubst $(build_path)%,%,$(jar_file) $(all_files_outside_jar))
+	$(ZIP) $(abspath $(xpi_file)) $(patsubst $(build_path)%,%,$(all_files))
 	@echo "Creating XPI file: Done!"
 
-$(jar_file): $(all_files_inside_jar)
-	@mkdir -p $(dir $(jar_file))
-	@rm -f $(jar_file)
-	@cd $(build_path) && \
-	$(ZIP) $(abspath $(jar_file)) $(patsubst $(build_path)%,%,$(all_files_inside_jar))
-
 # ___________________
 # processing of files
 #
@@ -115,11 +105,6 @@ $(javascript_files): $$(patsubst $$(build_path)%,$$(source_path)%,$$@)
 	cp $(patsubst $(build_path)%,$(source_path)%,$@) $@
 	@# In case javascript files should be processed, it should be done here.
 
-# Copy chrome.manifest.packaging (src) to chrome.manifest (build).
-$(chrome_manifest): $(source_path)chrome.manifest.packaging
-	@mkdir -p $(dir $@)
-	cp $(source_path)chrome.manifest.packaging $@
-
 $(other_files): $$(patsubst $$(build_path)%,$$(source_path)%,$$@)
 	@mkdir -p $(dir $@)
 	cp $(patsubst $(build_path)%,$(source_path)%,$@) $@
diff --git a/src/chrome.manifest.devel b/src/chrome.manifest.devel
deleted file mode 100644
index c195a30..0000000
--- a/src/chrome.manifest.devel
+++ /dev/null
@@ -1,38 +0,0 @@
-content    requestpolicy    content/
-resource   requestpolicy    modules/
-skin       requestpolicy    classic/1.0    skin/
-
-locale     requestpolicy    en-US          locale/en-US/
-locale     requestpolicy    de             locale/de/
-locale     requestpolicy    eo             locale/eo/
-locale     requestpolicy    es-MX          locale/es-MX/
-locale     requestpolicy    eu             locale/eu/
-locale     requestpolicy    fr             locale/fr/
-locale     requestpolicy    it             locale/it/
-locale     requestpolicy    ja             locale/ja/
-locale     requestpolicy    ko-KR          locale/ko-KR/
-locale     requestpolicy    lv-LV          locale/lv-LV/
-locale     requestpolicy    nl             locale/nl/
-locale     requestpolicy    pt-BR          locale/pt-BR/
-locale     requestpolicy    ru-RU          locale/ru-RU/
-locale     requestpolicy    sk-SK          locale/sk-SK/
-locale     requestpolicy    sv-SE          locale/sv-SE/
-locale     requestpolicy    tr             locale/tr/
-locale     requestpolicy    uk-UA          locale/uk-UA/
-locale     requestpolicy    zh-CN          locale/zh-CN/
-locale     requestpolicy    zh-TW          locale/zh-TW/
-
-style      chrome://global/content/customizeToolbar.xul            chrome://requestpolicy/skin/requestpolicy.css
-
-# Firefox
-overlay    chrome://browser/content/browser.xul                    chrome://requestpolicy/content/overlay.xul
-# Seamonkey
-overlay    chrome://navigator/content/navigatorOverlay.xul         chrome://requestpolicy/content/overlay.xul
-# Songbird
-overlay    chrome://songbird/content/xul/mainScriptsOverlay.xul    chrome://requestpolicy/content/overlay.xul
-
-# Gecko 2 requires component and category registration via chrome.manifest.
-component {14027e96-1afb-4066-8846-e6c89b5faf3b} components/requestpolicyService.js
-contract @requestpolicy.com/requestpolicy-service;1 {14027e96-1afb-4066-8846-e6c89b5faf3b}
-category profile-after-change RequestPolicyService @requestpolicy.com/requestpolicy-service;1
-category content-policy RequestPolicyService @requestpolicy.com/requestpolicy-service;1
diff --git a/src/chrome.manifest.packaging b/src/chrome.manifest.packaging
deleted file mode 100644
index 047083c..0000000
--- a/src/chrome.manifest.packaging
+++ /dev/null
@@ -1,38 +0,0 @@
-content    requestpolicy    jar:chrome/requestpolicy.jar!/content/
-resource   requestpolicy    modules/
-skin       requestpolicy    classic/1.0    jar:chrome/requestpolicy.jar!/skin/
-
-locale     requestpolicy    en-US          jar:chrome/requestpolicy.jar!/locale/en-US/
-locale     requestpolicy    de             jar:chrome/requestpolicy.jar!/locale/de/
-locale     requestpolicy    eo             jar:chrome/requestpolicy.jar!/locale/eo/
-locale     requestpolicy    es-MX          jar:chrome/requestpolicy.jar!/locale/es-MX/
-locale     requestpolicy    eu             jar:chrome/requestpolicy.jar!/locale/eu/
-locale     requestpolicy    fr             jar:chrome/requestpolicy.jar!/locale/fr/
-locale     requestpolicy    it             jar:chrome/requestpolicy.jar!/locale/it/
-locale     requestpolicy    ja             jar:chrome/requestpolicy.jar!/locale/ja/
-locale     requestpolicy    ko-KR          jar:chrome/requestpolicy.jar!/locale/ko-KR/
-locale     requestpolicy    lv-LV          jar:chrome/requestpolicy.jar!/locale/lv-LV/
-locale     requestpolicy    nl             jar:chrome/requestpolicy.jar!/locale/nl/
-locale     requestpolicy    pt-BR          jar:chrome/requestpolicy.jar!/locale/pt-BR/
-locale     requestpolicy    ru-RU          jar:chrome/requestpolicy.jar!/locale/ru-RU/
-locale     requestpolicy    sk-SK          jar:chrome/requestpolicy.jar!/locale/sk-SK/
-locale     requestpolicy    sv-SE          jar:chrome/requestpolicy.jar!/locale/sv-SE/
-locale     requestpolicy    tr             jar:chrome/requestpolicy.jar!/locale/tr/
-locale     requestpolicy    uk-UA          jar:chrome/requestpolicy.jar!/locale/uk-UA/
-locale     requestpolicy    zh-CN          jar:chrome/requestpolicy.jar!/locale/zh-CN/
-locale     requestpolicy    zh-TW          jar:chrome/requestpolicy.jar!/locale/zh-TW/
-
-style      chrome://global/content/customizeToolbar.xul            chrome://requestpolicy/skin/requestpolicy.css
-
-# Firefox
-overlay    chrome://browser/content/browser.xul                    chrome://requestpolicy/content/overlay.xul
-# Seamonkey
-overlay    chrome://navigator/content/navigatorOverlay.xul         chrome://requestpolicy/content/overlay.xul
-# Songbird
-overlay    chrome://songbird/content/xul/mainScriptsOverlay.xul    chrome://requestpolicy/content/overlay.xul
-
-# Gecko 2 requires component and category registration via chrome.manifest.
-component {14027e96-1afb-4066-8846-e6c89b5faf3b} components/requestpolicyService.js
-contract @requestpolicy.com/requestpolicy-service;1 {14027e96-1afb-4066-8846-e6c89b5faf3b}
-category profile-after-change RequestPolicyService @requestpolicy.com/requestpolicy-service;1
-category content-policy RequestPolicyService @requestpolicy.com/requestpolicy-service;1

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



More information about the Pkg-mozext-commits mailing list