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 @@ -124,39 +124,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
33 @@ -71,20 +71,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST |
34 install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; |
|
35 |
34 |
36 install:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
35 STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \ |
37 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile |
36 $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
|
37 cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
|
38 chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
|
39 $(NULL) |
|
40 endif |
|
41 |
|
42 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
|
43 +SEARCHPLUGINS_NAMES = $(shell cat \ |
|
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
|
45 + @srcdir@/en-US/searchplugins/list.txt ) ) |
|
46 SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins |
|
47 SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) |
|
48 -PP_TARGETS += SEARCHPLUGINS |
|
49 +#PP_TARGETS += SEARCHPLUGINS |
|
50 |
|
51 # Required for l10n.mk - defines a list of app sub dirs that should |
|
52 # be included in langpack xpis. |
|
53 ifdef MOZ_METRO |
|
54 # metro build, include both app folders |
|
55 DIST_SUBDIRS = browser metro |
|
56 else |
|
57 DIST_SUBDIRS = $(DIST_SUBDIR) |
|
58 @@ -142,20 +144,44 @@ install:: $(addprefix generic/profile/,$ |
38 |
59 |
39 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
60 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
40 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
61 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
41 |
62 |
42 -SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
63 # metro build calls back here for search engine plugins |
43 +SEARCH_PLUGINS = $(shell cat \ |
64 searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
65 .PHONY: searchplugins |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) |
|
46 |
66 |
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`;\ |
|
51 +tmp-search.jar.mn:: |
67 +tmp-search.jar.mn:: |
52 + printf "$(AB_CD).jar:" > $@ |
68 + printf "$(AB_CD).jar:" > $@ |
53 + printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >> $@ |
69 + printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ |
54 + @echo >> $@ |
70 + @echo >> $@ |
55 + |
71 + |
56 +searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS)) |
72 +searchplugins-jar:: $(SEARCHPLUGINS) |
57 + for SEARCH_PLUGIN in $^; do \ |
73 + for SEARCHPLUGIN in $^; do \ |
58 $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
74 + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
59 - $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \ |
75 + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ |
60 + $$SEARCH_PLUGIN > $$SEARCH_PLUGIN-new ; \ |
76 + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ |
61 + mv $$SEARCH_PLUGIN-new $$SEARCH_PLUGIN ; \ |
77 + done |
62 done |
78 + |
63 |
79 +searchplugins-jar:: tmp-search.jar.mn |
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 |
|
71 +searchplugins:: tmp-search.jar.mn |
|
72 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
80 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
73 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
81 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
74 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
82 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
75 + -s $(LOCALE_SRCDIR)/searchplugins \ |
83 + -s $(LOCALE_SRCDIR)/searchplugins \ |
76 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
84 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
77 |
85 + |
78 +libs:: searchplugins |
86 +libs:: searchplugins-jar |
79 + |
87 + |
80 +GARBAGE += tmp-search.jar.mn |
88 +GARBAGE += tmp-search.jar.mn |
81 |
89 + |
82 libs-%: |
90 libs-%: |
83 $(NSINSTALL) -D $(DIST)/install |
91 $(NSINSTALL) -D $(DIST)/install |
84 @$(MAKE) -C ../../toolkit/locales libs-$* |
92 @$(MAKE) -C ../../toolkit/locales libs-$* |
85 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* |
93 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* |
86 + @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* |
94 + @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* |
87 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* |
95 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* |
88 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* |
96 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* |
89 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) |
97 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) |
|
98 ifdef MOZ_METRO |
|
99 @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* |
|
100 endif |
90 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* |
101 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* |
91 |
102 |
92 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
103 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml |
93 repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
104 --- a/browser/locales/en-US/searchplugins/google.xml |
94 @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." |
105 +++ b/browser/locales/en-US/searchplugins/google.xml |
|
106 @@ -9,24 +9,16 @@ |
|
107 <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABUUlEQVR42pWTzUsCYRCH9y9zu3SooCCkjhIRRLeIykXokiWCJ7PvDpZRlz6si1lIQZ3SQxQdOhREpgSm0JeQvfu0+i6I7LKLh4F5h5nnnRl+o6jTdHn8omAYbVqhXqvYFXcEBKFDwcoZZB8B4LkEB9cwGGmFKHb01A1EU9JXzfdvDYZi1lwLwBcVAIwsNWPesIwls7gDtB2Z7N9ujVe+IX2LO2AgItB1OL9vJqsmILDrOoK02IkBAdYy4FsQJC5h+VQCHQDWTqYSgo8fuHuRxS4Ae3stQ7UGE5ttAHqCUgfxC7m4ryrowOyeO6CxqHwZxtYFqtYc5+kNan/gDTsAeueEIRj7n/rmRQMwueUAGF0VAAT3rQBTC0Y3DoDOGbm00icML4oWHYSTgo0MFqjlmPpDgqMcFCuQf4erBzjOwXjcriu9qHg0uutO2+es6fl67T9ptebvFRjBVgAAAABJRU5ErkJggg==</Image> |
|
108 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> |
|
109 <Url type="text/html" method="GET" template="https://www.google.com/search"> |
|
110 <Param name="q" value="{searchTerms}"/> |
|
111 <Param name="ie" value="utf-8"/> |
|
112 <Param name="oe" value="utf-8"/> |
|
113 <Param name="aq" value="t"/> |
|
114 <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/> |
|
115 -#if MOZ_UPDATE_CHANNEL == beta |
|
116 - <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/> |
|
117 -#elif MOZ_UPDATE_CHANNEL == aurora |
|
118 - <MozParam name="client" condition="defaultEngine" trueValue="firefox-aurora" falseValue="firefox"/> |
|
119 -#elif MOZ_UPDATE_CHANNEL == nightly |
|
120 - <MozParam name="client" condition="defaultEngine" trueValue="firefox-nightly" falseValue="firefox"/> |
|
121 -#else |
|
122 <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/> |
|
123 -#endif |
|
124 <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/> |
|
125 <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/> |
|
126 <MozParam name="channel" condition="purpose" purpose="homepage" value="np"/> |
|
127 <MozParam name="source" condition="purpose" purpose="homepage" value="hp"/> |
|
128 </Url> |
|
129 <SearchForm>https://www.google.com/</SearchForm> |
|
130 </SearchPlugin> |
95 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
131 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
96 --- a/browser/locales/jar.mn |
132 --- a/browser/locales/jar.mn |
97 +++ b/browser/locales/jar.mn |
133 +++ b/browser/locales/jar.mn |
98 @@ -108,16 +108,17 @@ |
134 @@ -115,16 +115,17 @@ |
|
135 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
|
136 #endif |
|
137 % locale browser-region @AB_CD@ %locale/browser-region/ |
99 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
138 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
100 # the following files are browser-specific overrides |
139 # the following files are browser-specific overrides |
101 locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
140 locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
102 locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
141 locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
103 locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
142 locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
|
143 + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) |
104 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd |
144 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd |
105 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties |
145 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties |
106 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd |
146 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd |
107 + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) |
|
108 % locale testpilot @AB_CD@ %locale/feedback/ |
147 % locale testpilot @AB_CD@ %locale/feedback/ |
109 locale/feedback/main.dtd (%feedback/main.dtd) |
148 locale/feedback/main.dtd (%feedback/main.dtd) |
110 locale/feedback/main.properties (%feedback/main.properties) |
149 locale/feedback/main.properties (%feedback/main.properties) |
111 % locale pdf.js @AB_CD@ %locale/pdfviewer/ |
150 % locale pdf.js @AB_CD@ %locale/pdfviewer/ |
112 locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) |
151 locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) |
113 locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) |
|
114 #ifdef MOZ_WEBAPP_RUNTIME |
|
115 ../webapprt/chrome/@AB_CD@.jar: |
|