1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 8b1b35442fee96324a141ab5d7710c3a88769df5 |
3 # Parent cc2dd10c3b24c5fceeaf318e00cc1264f99edba2 |
4 Add searchplugins to chrome packaging for proper localization |
4 Add searchplugins to chrome packaging for proper localization |
5 |
5 |
6 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
6 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
7 --- a/browser/app/profile/firefox.js |
7 --- a/browser/app/profile/firefox.js |
8 +++ b/browser/app/profile/firefox.js |
8 +++ b/browser/app/profile/firefox.js |
9 @@ -323,16 +323,20 @@ pref("browser.download.manager.scanWhenD |
9 @@ -341,16 +341,20 @@ pref("browser.download.manager.scanWhenD |
10 pref("browser.download.manager.resumeOnWakeDelay", 10000); |
10 pref("browser.download.manager.resumeOnWakeDelay", 10000); |
11 |
11 |
12 // search engines URL |
12 // search engines URL |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
14 |
14 |
28 pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); |
28 pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); |
29 |
29 |
30 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
30 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
31 --- a/browser/locales/Makefile.in |
31 --- a/browser/locales/Makefile.in |
32 +++ b/browser/locales/Makefile.in |
32 +++ b/browser/locales/Makefile.in |
33 @@ -167,29 +167,41 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
33 @@ -153,17 +153,41 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
34 install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; |
34 install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; |
35 |
35 |
36 install:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
36 install:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
37 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile |
37 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile |
38 |
38 |
39 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
39 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
40 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
40 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
41 |
41 |
42 -SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
42 -SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
43 +SEARCH_PLUGINS = $(shell cat \ |
43 +SEARCH_PLUGINS = $(shell cat \ |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) |
46 |
46 + |
47 -libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
|
48 - $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins |
|
49 +tmp-search.jar.mn:: |
47 +tmp-search.jar.mn:: |
50 + printf "$(AB_CD).jar:" > $@ |
48 + printf "$(AB_CD).jar:" > $@ |
51 + printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ |
49 + printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ |
52 + @echo >> $@ |
50 + @echo >> $@ |
53 |
51 + |
54 -install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
52 +searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
55 - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins |
53 + for SEARCH_PLUGIN in $^; do \ |
56 +searchplugins: tmp-search.jar.mn |
54 + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
|
55 + $$SEARCH_PLUGIN > $$SEARCH_PLUGIN ; \ |
|
56 + done |
|
57 + |
|
58 +searchplugins:: tmp-search.jar.mn |
57 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
59 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
58 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
60 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
59 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
61 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
60 + -s $(LOCALE_SRCDIR)/searchplugins \ |
62 + -s $(LOCALE_SRCDIR)/searchplugins \ |
61 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
63 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
62 |
64 + |
63 +export:: searchplugins |
65 +export:: searchplugins |
64 + |
66 + |
65 +GARBAGE += tmp-search.jar.mn |
67 +GARBAGE += tmp-search.jar.mn |
|
68 |
|
69 libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
|
70 $(NSINSTALL) -D $(FINAL_TARGET)/searchplugins |
|
71 for SEARCH_PLUGIN in $^; do\ |
|
72 SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\ |
|
73 $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
|
74 $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \ |
|
75 done |
|
76 @@ -176,16 +200,17 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG |
|
77 $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \ |
|
78 done |
|
79 |
66 |
80 |
67 libs-%: |
81 libs-%: |
68 $(NSINSTALL) -D $(DIST)/install |
82 $(NSINSTALL) -D $(DIST)/install |
69 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
83 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
70 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
84 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
78 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
92 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
79 repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
93 repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
80 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
94 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
81 --- a/browser/locales/jar.mn |
95 --- a/browser/locales/jar.mn |
82 +++ b/browser/locales/jar.mn |
96 +++ b/browser/locales/jar.mn |
83 @@ -84,11 +84,12 @@ |
97 @@ -97,11 +97,12 @@ |
84 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
98 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
85 # the following files are browser-specific overrides |
99 # the following files are browser-specific overrides |
86 * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
100 * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
87 * locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
101 * locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
88 * locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
102 * locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |