1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent e3da64303bf904a8da2410754026b7a00480a589 |
3 # Parent ec1efb28a1fea666f22730689d811fc67720f2db |
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 @@ -321,16 +321,20 @@ pref("browser.download.manager.scanWhenD |
9 @@ -327,16 +327,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%/%APP%/search-engines/"); |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/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 @@ -169,31 +169,44 @@ libs:: $(addprefix $(LOCALE_SRCDIR)/prof |
33 @@ -167,31 +167,43 @@ 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:: $(addprefix $(LOCALE_SRCDIR)/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 $(LOCALE_SRCDIR)/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)) |
47 -libs:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
57 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
57 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
58 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
58 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
59 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
59 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
60 + -s $(LOCALE_SRCDIR)/searchplugins \ |
60 + -s $(LOCALE_SRCDIR)/searchplugins \ |
61 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
61 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
62 + |
62 |
63 +export:: searchplugins |
63 +export:: searchplugins |
64 + |
64 + |
65 +GARBAGE += tmp-search.jar.mn |
65 +GARBAGE += tmp-search.jar.mn |
66 |
|
67 |
66 |
68 libs-%: |
67 libs-%: |
69 $(NSINSTALL) -D $(DIST)/install |
68 $(NSINSTALL) -D $(DIST)/install |
70 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
69 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
71 ifdef MOZ_SERVICES_SYNC |
70 ifdef MOZ_SERVICES_SYNC |
75 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
74 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
76 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 |
75 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 |
77 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
76 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
78 |
77 |
79 |
78 |
80 repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" |
79 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
81 repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) |
80 repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
82 @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." |
81 @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." |
83 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
82 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
84 --- a/browser/locales/jar.mn |
83 --- a/browser/locales/jar.mn |
85 +++ b/browser/locales/jar.mn |
84 +++ b/browser/locales/jar.mn |
86 @@ -81,11 +81,12 @@ |
85 @@ -81,11 +81,12 @@ |