wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1255811 - Some (all) locales for Firefox 46.0b1 are busted due to l10n merge issues r=jlund a=release DONTBUILD

Browse Source 
MozReview-Commit-ID: 100GniUy5lT
This commit is contained in:
Rail Aliiev 2016-03-11 14:47:19 -05:00
parent 763aa8d8bc
commit d8db7de393
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/mozharness/configs/single_locale/win32.py
View File

@ -9,10 +9,9 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-l10n",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
},

3
testing/mozharness/configs/single_locale/win64.py
View File

@ -9,10 +9,9 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-l10n",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
"LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
},

3
testing/mozharness/scripts/desktop_l10n.py
View File

@ -369,6 +369,9 @@ class DesktopSingleLocale(LocalesMixin, ReleaseMixin, MockMixin, BuildbotMixin,
if binary.endswith('.exe'):
binary_path = binary_path.replace('\\', '\\\\\\\\')
bootstrap_env[name] = binary_path
if 'LOCALE_MERGEDIR' in bootstrap_env:
# windows fix
bootstrap_env['LOCALE_MERGEDIR'] = bootstrap_env['LOCALE_MERGEDIR'].replace('\\', '\\\\\\\\')
if self.query_is_nightly():
bootstrap_env["IS_NIGHTLY"] = "yes"
self.bootstrap_env = bootstrap_env