1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent f144d934d339d048bf9b650fc776397029150dd6 |
2 # Parent 14ed7d2308e6f129e791449afa0d58869e451264 |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
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 @@ -381,16 +381,20 @@ pref("browser.helperApps.deleteTempFileO |
9 @@ -368,16 +368,20 @@ pref("browser.helperApps.deleteTempFileO |
10 #endif |
10 #endif |
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 @@ -66,21 +66,23 @@ STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST |
33 @@ -66,21 +66,23 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST |
34 cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
34 cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ |
35 chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
35 chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ |
36 $(NULL) |
36 $(NULL) |
37 endif |
37 endif |
38 |
38 |
39 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) |
39 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) |
40 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) |
40 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) |
54 ifdef MOZ_METRO |
54 ifdef MOZ_METRO |
55 # metro build, include both app folders |
55 # metro build, include both app folders |
56 DIST_SUBDIRS = browser metro |
56 DIST_SUBDIRS = browser metro |
57 else |
57 else |
58 DIST_SUBDIRS = $(DIST_SUBDIR) |
58 DIST_SUBDIRS = $(DIST_SUBDIR) |
59 @@ -127,20 +129,44 @@ install:: $(addprefix generic/profile/,$ |
59 @@ -118,16 +120,39 @@ libs:: $(addprefix generic/profile/,$(PR |
60 |
60 |
61 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
61 libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
62 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
62 $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome |
63 |
63 |
64 # metro build calls back here for search engine plugins |
64 # metro build calls back here for search engine plugins |
65 searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) |
65 searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) |
66 .PHONY: searchplugins |
66 .PHONY: searchplugins |
67 |
67 |
70 + printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ |
70 + printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ |
71 + @echo >> $@ |
71 + @echo >> $@ |
72 + |
72 + |
73 +searchplugins-jar:: $(SEARCHPLUGINS) |
73 +searchplugins-jar:: $(SEARCHPLUGINS) |
74 + for SEARCHPLUGIN in $^; do \ |
74 + for SEARCHPLUGIN in $^; do \ |
75 + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
75 + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
76 + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ |
76 + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ |
77 + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ |
77 + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ |
78 + done |
78 + done |
79 + |
79 + |
80 +searchplugins-jar:: tmp-search.jar.mn |
80 +searchplugins-jar:: tmp-search.jar.mn |
81 + $(call py_action,jar_maker,\ |
81 + $(call py_action,jar_maker,\ |
82 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
82 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
83 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
83 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
84 + -s $(LOCALE_SRCDIR)/searchplugins \ |
84 + -s $(LOCALE_SRCDIR)/searchplugins \ |
85 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn) |
85 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn) |
86 + |
86 + |
87 +libs:: searchplugins-jar |
87 +libs:: searchplugins-jar |
88 + |
88 + |
89 +GARBAGE += tmp-search.jar.mn |
89 +GARBAGE += tmp-search.jar.mn |
90 + |
90 + |
91 libs-%: |
91 libs-%: |
92 $(NSINSTALL) -D $(DIST)/install |
92 $(NSINSTALL) -D $(DIST)/install |
93 @$(MAKE) -C ../../toolkit/locales libs-$* |
93 @$(MAKE) -C ../../toolkit/locales libs-$* |
94 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* |
94 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* |
95 + @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* |
|
96 ifdef MOZ_WEBAPP_RUNTIME |
95 ifdef MOZ_WEBAPP_RUNTIME |
97 @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* |
96 @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* |
98 endif |
97 endif |
99 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* |
98 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* |
100 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* |
|
101 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) |
|
102 ifdef MOZ_METRO |
|
103 @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* |
|
104 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml |
99 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml |
105 --- a/browser/locales/en-US/searchplugins/google.xml |
100 --- a/browser/locales/en-US/searchplugins/google.xml |
106 +++ b/browser/locales/en-US/searchplugins/google.xml |
101 +++ b/browser/locales/en-US/searchplugins/google.xml |
107 @@ -9,25 +9,17 @@ |
102 @@ -9,25 +9,17 @@ |
108 <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAB9AQAAJgAAACAgAAAAAAAA8gIAAKMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAFESURBVDjLpZNJSwNBEIXnt4lE4kHxovgT9BDwJHqPy0HEEOJBiAuCRg+KUdC4QS4KrpC4gCBGE3NQ48JsnZ6eZ3UOM6gjaePhQU93v6+qq2q0pqgeJj2S8EdJT1hr0OxBtKCD5iEd8QxDYpvhvOBAuMDKURX9C9aPu4GA1GEVkzvMg10UBfYveWAWgYAP00V01fa+R9M2bA51wJvhIn3qR+ybt3D3JNQBE5sMjCIOLFpoHzOwdsLRO22qA6R6kiZiWwxUvy/PUQZIhYZ1vFM9cvcOOsYNdcBgysISdSJBnZjJMlR0Fw8vAp0xoz5gao/h+NZBy4i/10XGwrPA+hmvDyhVRG2Avu/LwcrkFADZa16L1h330w1RNgc3DiJzCpPYRm1bpveXX11clQR28xwblHpk1vq1iP/5mcoS0CoXDZiL0vsJ+dzfl+3T/VYAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAK5SURBVFjDxVfrSxRRFJ9/Jta/oyWjF5XQm6D6EkHRgygIIgjUTcueVgqVWSRRkppEUQYWWB8ye1iGWilWlo/Ude489s7M6Zw7D9dlt53dmd29cFiWvXvO77x+51xpaaUsoSxBaUWZQ4ECy5xji2xKZDyCMlMEw6lCNiOSgwZKJK1SkcKeSealfP64t0mBjl4Ow39MkDUL0p2RSROOtqhZdeUEYM1pBl39XCg/fEeFtWcY7G9W4csvUxjlBkCsQ4Nt9QyWVfvT6RsAKXw3aoDGATZeYIt+W1kjw7cJG0RctWDTRebbKd8A6h5pwsDb70ba3w/eUr3wt/cmwgfw6Yft4TNMQaY7o1P2ncm4FT4ANQH/jQBJ2xv7kqIXEADDql8eS3+n8bku7oxNm+EDIM/dU92upb3T/NJGeaNbDx/AsbsLRUY5Xn92caWXY5d8RV6gWllxSg4fAEnTC90DQW13BLlgXR2D3dcUeDVkwOthA1bXspxILWcm3HdThcfvufB26LcJpkOEAz9NKI/lzqpSEC7feol5EWnpSeSlIxCALUkApmULdjUqxQVAQnl3D/X/yQda4QBEq2TYc12By091MQ17Bg3R88nHKlQbVmHvj89awNBLYrwT9zXY2aBAxTkGFdiSxP/Jp6FLDw+AS7GfsdJTJ2EqSO5khD43nGfBARy/ZxOQgZHe7GPM1jzUvChUtmnBAXQPcKGMJp3fdFGq6NByEhiAO4b/YptFfQJwNyQ/bZkVQGcf90Ja25ndIyrKBOa/f8wIpwi3X1G8UcxNu7ozUS7tiH0jBswwS3RIaF1w6LYKU/ML2+8sGnjygQswtKrVIy/Qd9qQP6LnO64q4fPAKpxyZIymHo1jWk6p1ag2BsdNwQMHcC+M5kHFJX+YlPxpVlbCx2mZ5DzPI04k4kUwHHdskU3pH76iftG8yWlkAAAAAElFTkSuQmCC</Image> |
103 <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAB9AQAAJgAAACAgAAAAAAAA8gIAAKMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAFESURBVDjLpZNJSwNBEIXnt4lE4kHxovgT9BDwJHqPy0HEEOJBiAuCRg+KUdC4QS4KrpC4gCBGE3NQ48JsnZ6eZ3UOM6gjaePhQU93v6+qq2q0pqgeJj2S8EdJT1hr0OxBtKCD5iEd8QxDYpvhvOBAuMDKURX9C9aPu4GA1GEVkzvMg10UBfYveWAWgYAP00V01fa+R9M2bA51wJvhIn3qR+ybt3D3JNQBE5sMjCIOLFpoHzOwdsLRO22qA6R6kiZiWwxUvy/PUQZIhYZ1vFM9cvcOOsYNdcBgysISdSJBnZjJMlR0Fw8vAp0xoz5gao/h+NZBy4i/10XGwrPA+hmvDyhVRG2Avu/LwcrkFADZa16L1h330w1RNgc3DiJzCpPYRm1bpveXX11clQR28xwblHpk1vq1iP/5mcoS0CoXDZiL0vsJ+dzfl+3T/VYAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAK5SURBVFjDxVfrSxRRFJ9/Jta/oyWjF5XQm6D6EkHRgygIIgjUTcueVgqVWSRRkppEUQYWWB8ye1iGWilWlo/Ude489s7M6Zw7D9dlt53dmd29cFiWvXvO77x+51xpaaUsoSxBaUWZQ4ECy5xji2xKZDyCMlMEw6lCNiOSgwZKJK1SkcKeSealfP64t0mBjl4Ow39MkDUL0p2RSROOtqhZdeUEYM1pBl39XCg/fEeFtWcY7G9W4csvUxjlBkCsQ4Nt9QyWVfvT6RsAKXw3aoDGATZeYIt+W1kjw7cJG0RctWDTRebbKd8A6h5pwsDb70ba3w/eUr3wt/cmwgfw6Yft4TNMQaY7o1P2ncm4FT4ANQH/jQBJ2xv7kqIXEADDql8eS3+n8bku7oxNm+EDIM/dU92upb3T/NJGeaNbDx/AsbsLRUY5Xn92caWXY5d8RV6gWllxSg4fAEnTC90DQW13BLlgXR2D3dcUeDVkwOthA1bXspxILWcm3HdThcfvufB26LcJpkOEAz9NKI/lzqpSEC7feol5EWnpSeSlIxCALUkApmULdjUqxQVAQnl3D/X/yQda4QBEq2TYc12By091MQ17Bg3R88nHKlQbVmHvj89awNBLYrwT9zXY2aBAxTkGFdiSxP/Jp6FLDw+AS7GfsdJTJ2EqSO5khD43nGfBARy/ZxOQgZHe7GPM1jzUvChUtmnBAXQPcKGMJp3fdFGq6NByEhiAO4b/YptFfQJwNyQ/bZkVQGcf90Ja25ndIyrKBOa/f8wIpwi3X1G8UcxNu7ozUS7tiH0jBswwS3RIaF1w6LYKU/ML2+8sGnjygQswtKrVIy/Qd9qQP6LnO64q4fPAKpxyZIymHo1jWk6p1ag2BsdNwQMHcC+M5kHFJX+YlPxpVlbCx2mZ5DzPI04k4kUwHHdskU3pH76iftG8yWlkAAAAAElFTkSuQmCC</Image> |
131 <SearchForm>https://www.google.com/</SearchForm> |
126 <SearchForm>https://www.google.com/</SearchForm> |
132 </SearchPlugin> |
127 </SearchPlugin> |
133 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
128 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
134 --- a/browser/locales/jar.mn |
129 --- a/browser/locales/jar.mn |
135 +++ b/browser/locales/jar.mn |
130 +++ b/browser/locales/jar.mn |
136 @@ -124,14 +124,15 @@ |
131 @@ -123,14 +123,15 @@ |
137 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
132 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
138 #endif |
133 #endif |
139 % locale browser-region @AB_CD@ %locale/browser-region/ |
134 % locale browser-region @AB_CD@ %locale/browser-region/ |
140 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
135 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
141 # the following files are browser-specific overrides |
136 # the following files are browser-specific overrides |