author | Wolfgang Rosenauer <wr@rosenauer.org> |
Mon, 08 Oct 2012 23:00:15 +0200 | |
changeset 554 | d19c7ee78903 |
parent 541 | 830e50bbfc79 |
child 606 | 9d39369e1b4c |
permissions | -rw-r--r-- |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
3 |
# Parent ba286b90465d93b93487c0de6f8ebe5d1821d2c0 |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
Add searchplugins to chrome packaging for proper localization |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
--- a/browser/app/profile/firefox.js |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
+++ b/browser/app/profile/firefox.js |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
9 |
@@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr |
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
418
diff
changeset
|
10 |
pref("browser.download.panel.removeFinishedDownloads", false); |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
// search engines URL |
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
13 |
pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
// pointer to the default engine name |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
+// Tell the search service to load search plugins from the locale JAR |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
+pref("browser.search.loadFromJars", true); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
+pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
// disable logging for the search service by default |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
pref("browser.search.log", false); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
// Ordering of Search Engines in the Engine list. |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
--- a/browser/locales/Makefile.in |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
+++ b/browser/locales/Makefile.in |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
33 |
@@ -118,39 +118,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
install:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
|
251
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
220
diff
changeset
|
39 |
install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
|
251
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
220
diff
changeset
|
42 |
-SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
+SEARCH_PLUGINS = $(shell cat \ |
409 | 44 |
+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
45 |
+ @srcdir@/en-US/searchplugins/list.txt ) ) |
|
410 | 46 |
|
47 |
-libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
|
48 |
- $(NSINSTALL) -D $(FINAL_TARGET)/searchplugins |
|
49 |
- for SEARCH_PLUGIN in $^; do\ |
|
50 |
- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ |
|
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
+tmp-search.jar.mn:: |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
+ printf "$(AB_CD).jar:" > $@ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
+ printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
+ @echo >> $@ |
409 | 55 |
+ |
56 |
+searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
|
57 |
+ for SEARCH_PLUGIN in $^; do \ |
|
410 | 58 |
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
59 |
- $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \ |
|
60 |
+ $$SEARCH_PLUGIN > $$SEARCH_PLUGIN-new ; \ |
|
61 |
+ mv $$SEARCH_PLUGIN-new $$SEARCH_PLUGIN ; \ |
|
62 |
done |
|
63 |
||
64 |
-install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
|
65 |
- $(NSINSTALL) -D $(DESTDIR)$(mozappdir)/searchplugins |
|
66 |
- for i in $^; do \ |
|
67 |
- SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ |
|
68 |
- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
|
69 |
- $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \ |
|
70 |
- done |
|
409 | 71 |
+searchplugins:: tmp-search.jar.mn |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
+ $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
+ $(QUIET) -j $(FINAL_TARGET)/chrome \ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
+ -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
+ -s $(LOCALE_SRCDIR)/searchplugins \ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
+ $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
410 | 77 |
|
418 | 78 |
+libs:: searchplugins |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
+ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
+GARBAGE += tmp-search.jar.mn |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
82 |
libs-%: |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
83 |
$(NSINSTALL) -D $(DIST)/install |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
84 |
@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
+ @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
87 |
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
88 |
@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
89 |
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
91 |
|
251
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
220
diff
changeset
|
92 |
repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
93 |
repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
94 |
@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
95 |
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
96 |
--- a/browser/locales/jar.mn |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
+++ b/browser/locales/jar.mn |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
98 |
@@ -108,16 +108,17 @@ |
220
2538fd6a51be
update to 2.0b10/4.0b10
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
198
diff
changeset
|
99 |
locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
2538fd6a51be
update to 2.0b10/4.0b10
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
198
diff
changeset
|
100 |
# the following files are browser-specific overrides |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
101 |
locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
102 |
locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
103 |
locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
104 |
% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
105 |
% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
106 |
% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd |
220
2538fd6a51be
update to 2.0b10/4.0b10
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
198
diff
changeset
|
107 |
+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
% locale testpilot @AB_CD@ %locale/feedback/ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
109 |
locale/feedback/main.dtd (%feedback/main.dtd) |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
110 |
locale/feedback/main.properties (%feedback/main.properties) |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
111 |
% locale pdf.js @AB_CD@ %locale/pdfviewer/ |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
112 |
locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
113 |
locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) |
462
2d86bdb4277f
14.0b6 (Aurora->Beta)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
114 |
#ifdef MOZ_WEBAPP_RUNTIME |
515 | 115 |
../webapprt/chrome/@AB_CD@.jar: |