Merge m-c to inbound, a=merge
authorWes Kocher <wkocher@mozilla.com>
Thu, 01 Jun 2017 18:41:34 -0700
changeset 361985 7a5c8b4e83624a07659e1effbb6f3188d5812145
parent 361984 f0f74276deb7bdfb29388574aa5793dc7c53df17 (current diff)
parent 361914 28dff773a7ae9ea84ebf96209db2bb7be8548e6e (diff)
child 361986 95955d13e7d9b99bd53288f2dd72501f553e2c04
push id31953
push usercbook@mozilla.com
push dateFri, 02 Jun 2017 12:22:33 +0000
treeherdermozilla-central@2a8478029a0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound, a=merge MozReview-Commit-ID: 1JFyQ1v7Ldm
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -93,21 +93,21 @@ var whitelist = new Set([
 
   // The l10n build system can't package string files only for some platforms.
   {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/mac/accessible.properties",
    platforms: ["linux", "win"]},
   {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/mac/intl.properties",
    platforms: ["linux", "win"]},
   {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/mac/platformKeys.properties",
    platforms: ["linux", "win"]},
-  {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/accessible.properties",
+  {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties",
    platforms: ["macosx", "win"]},
-  {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/intl.properties",
+  {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/intl.properties",
    platforms: ["macosx", "win"]},
-  {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties",
+  {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties",
    platforms: ["macosx", "win"]},
   {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/win/accessible.properties",
    platforms: ["linux", "macosx"]},
   {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/win/intl.properties",
    platforms: ["linux", "macosx"]},
   {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties",
    platforms: ["linux", "macosx"]},
 
--- a/browser/extensions/flyweb/jar.mn
+++ b/browser/extensions/flyweb/jar.mn
@@ -1,10 +1,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [features/flyweb@mozilla.org] chrome.jar:
-% skin flyweb classic/1.0 %skin/linux/ os=LikeUnix
+% skin flyweb classic/1.0 %skin/linux/
 % skin flyweb classic/1.0 %skin/osx/ os=Darwin
 % skin flyweb classic/1.0 %skin/windows/ os=WINNT
 % skin flyweb-shared classic/1.0 %skin/shared/
   skin/  (skin/*)
--- a/browser/extensions/formautofill/jar.mn
+++ b/browser/extensions/formautofill/jar.mn
@@ -4,13 +4,13 @@
 
 [features/formautofill@mozilla.org] chrome.jar:
 % resource formautofill %res/
   res/ (*.jsm)
 
 % content formautofill %content/
   content/ (content/*)
 
-% skin formautofill classic/1.0 %skin/linux/ os=LikeUnix
+% skin formautofill classic/1.0 %skin/linux/
 % skin formautofill classic/1.0 %skin/osx/ os=Darwin
 % skin formautofill classic/1.0 %skin/windows/ os=WINNT
 % skin formautofill-shared classic/1.0 %skin/shared/
   skin/  (skin/*)
--- a/browser/extensions/pocket/jar.mn
+++ b/browser/extensions/pocket/jar.mn
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [features/firefox@getpocket.com] chrome.jar:
 % content pocket %content/ contentaccessible=yes
-% skin pocket classic/1.0 %skin/linux/ os=LikeUnix
+% skin pocket classic/1.0 %skin/linux/
 % skin pocket classic/1.0 %skin/osx/ os=Darwin
 % skin pocket classic/1.0 %skin/windows/ os=WINNT
 % skin pocket-shared classic/1.0 %skin/shared/
   content/  (content/*)
   skin/shared (skin/shared/*)
 #ifdef XP_WIN
   skin/windows/ (skin/windows/*.png)
 * skin/windows/pocket.css (skin/windows/pocket.css)
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -187,19 +187,19 @@ chrome/en-US/locale/en-US/browser/overri
 chrome/en-US/locale/en-US/browser/overrides/global/mozilla.dtd
 chrome/en-US/locale/en-US/browser/overrides/intl.css
 chrome/en-US/locale/en-US/browser/overrides/intl.properties
 chrome/en-US/locale/en-US/browser/overrides/passwordmgr.properties
 chrome/en-US/locale/en-US/browser/overrides/plugins.properties
 chrome/en-US/locale/en-US/browser/overrides/plugins/pluginproblem.dtd
 chrome/en-US/locale/en-US/browser/overrides/search/search.properties
 chrome/en-US/locale/en-US/global-platform/mac/intl.properties
-chrome/en-US/locale/en-US/global-platform/unix/accessible.properties
-chrome/en-US/locale/en-US/global-platform/unix/intl.properties
-chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties
+chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties
+chrome/en-US/locale/en-US/global-platform/gtk/intl.properties
+chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties
 chrome/en-US/locale/en-US/global-platform/win/accessible.properties
 chrome/en-US/locale/en-US/global-platform/win/intl.properties
 chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
 chrome/en-US/locale/en-US/global/AccessFu.properties
 chrome/en-US/locale/en-US/global/about.dtd
 chrome/en-US/locale/en-US/global/aboutAbout.dtd
 chrome/en-US/locale/en-US/global/aboutReader.properties
 chrome/en-US/locale/en-US/global/aboutRights.dtd
--- a/dom/locales/jar.mn
+++ b/dom/locales/jar.mn
@@ -25,11 +25,11 @@
   locale/@AB_CD@/global/layout/xmlparser.properties            (%chrome/layout/xmlparser.properties)
   locale/@AB_CD@/global/layout/HtmlForm.properties             (%chrome/layout/HtmlForm.properties)
   locale/@AB_CD@/global/security/caps.properties               (%chrome/security/caps.properties)
   locale/@AB_CD@/global/security/csp.properties                (%chrome/security/csp.properties)
   locale/@AB_CD@/global/security/security.properties           (%chrome/security/security.properties)
   locale/@AB_CD@/global/xml/prettyprint.dtd                    (%chrome/xml/prettyprint.dtd)
   locale/@AB_CD@/global-platform/win/accessible.properties     (%chrome/accessibility/win/accessible.properties)
   locale/@AB_CD@/global-platform/mac/accessible.properties     (%chrome/accessibility/mac/accessible.properties)
-  locale/@AB_CD@/global-platform/unix/accessible.properties    (%chrome/accessibility/unix/accessible.properties)
+  locale/@AB_CD@/global-platform/gtk/accessible.properties     (%chrome/accessibility/unix/accessible.properties)
   locale/@AB_CD@/global/AccessFu.properties                    (%chrome/accessibility/AccessFu.properties)
   locale/@AB_CD@/global/mathml/mathml.properties               (%chrome/mathml/mathml.properties)
--- a/mobile/android/installer/allowed-dupes.mn
+++ b/mobile/android/installer/allowed-dupes.mn
@@ -79,19 +79,19 @@ chrome/en-US/locale/en-US/browser/overri
 chrome/en-US/locale/en-US/browser/overrides/global/aboutTelemetry.properties
 chrome/en-US/locale/en-US/browser/overrides/global/aboutWebrtc.properties
 chrome/en-US/locale/en-US/browser/overrides/intl.properties
 chrome/en-US/locale/en-US/browser/overrides/passwordmgr.properties
 chrome/en-US/locale/en-US/browser/overrides/plugins.properties
 chrome/en-US/locale/en-US/browser/overrides/plugins/pluginproblem.dtd
 chrome/en-US/locale/en-US/browser/overrides/search/search.properties
 chrome/en-US/locale/en-US/global-platform/mac/intl.properties
-chrome/en-US/locale/en-US/global-platform/unix/accessible.properties
-chrome/en-US/locale/en-US/global-platform/unix/intl.properties
-chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties
+chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties
+chrome/en-US/locale/en-US/global-platform/gtk/intl.properties
+chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties
 chrome/en-US/locale/en-US/global-platform/win/accessible.properties
 chrome/en-US/locale/en-US/global-platform/win/intl.properties
 chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
 chrome/en-US/locale/en-US/global/AccessFu.properties
 chrome/en-US/locale/en-US/global/about.dtd
 chrome/en-US/locale/en-US/global/aboutAbout.dtd
 chrome/en-US/locale/en-US/global/aboutReader.properties
 chrome/en-US/locale/en-US/global/aboutRights.dtd
--- a/mobile/locales/l10n-changesets.json
+++ b/mobile/locales/l10n-changesets.json
@@ -34,16 +34,23 @@
     "az": {
         "platforms": [
             "android", 
             "android-api-15", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
+    "be": {
+        "platforms": [
+            "android", 
+            "android-api-15"
+        ], 
+        "revision": "default"
+    }, 
     "bg": {
         "platforms": [
             "android", 
             "android-api-15", 
             "android-multilocale"
         ], 
         "revision": "default"
     }, 
--- a/python/mozbuild/mozpack/packager/l10n.py
+++ b/python/mozbuild/mozpack/packager/l10n.py
@@ -134,17 +134,17 @@ def _repack(app_finder, l10n_finder, cop
     paths = {}
     for e in app.entries:
         if isinstance(e, ManifestEntryWithRelPath):
             base = mozpath.basedir(e.path, app.bases)
             if base not in l10n_paths:
                 errors.fatal("Locale doesn't contain %s/" % base)
                 # Allow errors to accumulate
                 continue
-            if key(e) not in l10n_paths[base]:
+            if e.name not in l10n_paths[base]:
                 errors.fatal("Locale doesn't have a manifest entry for '%s'" %
                     e.name)
                 # Allow errors to accumulate
                 continue
             paths[e.path] = l10n_paths[base][key(e)]
 
     for pattern in non_chrome:
         for base in app.bases:
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -87,24 +87,24 @@
   locale/@AB_CD@/global/textcontext.dtd                 (%chrome/global/textcontext.dtd)
   locale/@AB_CD@/global/videocontrols.dtd               (%chrome/global/videocontrols.dtd)
   locale/@AB_CD@/global/viewSource.dtd                  (%chrome/global/viewSource.dtd)
   locale/@AB_CD@/global/viewSource.properties           (%chrome/global/viewSource.properties)
   locale/@AB_CD@/global/wizard.dtd                      (%chrome/global/wizard.dtd)
   locale/@AB_CD@/global/wizard.properties               (%chrome/global/wizard.properties)
   locale/@AB_CD@/global/crashes.dtd                     (%crashreporter/crashes.dtd)
   locale/@AB_CD@/global/crashes.properties              (%crashreporter/crashes.properties)
-% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/unix/ os=LikeUnix
+% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/gtk/
 % locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/mac/ os=Darwin
 % locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/win/ os=WINNT
   locale/@AB_CD@/global-platform/mac/platformKeys.properties  (%chrome/global-platform/mac/platformKeys.properties)
-  locale/@AB_CD@/global-platform/unix/platformKeys.properties (%chrome/global-platform/unix/platformKeys.properties)
+  locale/@AB_CD@/global-platform/gtk/platformKeys.properties  (%chrome/global-platform/unix/platformKeys.properties)
   locale/@AB_CD@/global-platform/win/platformKeys.properties  (%chrome/global-platform/win/platformKeys.properties)
   locale/@AB_CD@/global-platform/mac/intl.properties          (%chrome/global-platform/mac/intl.properties)
-  locale/@AB_CD@/global-platform/unix/intl.properties         (%chrome/global-platform/unix/intl.properties)
+  locale/@AB_CD@/global-platform/gtk/intl.properties          (%chrome/global-platform/unix/intl.properties)
   locale/@AB_CD@/global-platform/win/intl.properties          (%chrome/global-platform/win/intl.properties)
 % locale mozapps @AB_CD@ %locale/@AB_CD@/mozapps/
   locale/@AB_CD@/mozapps/downloads/unknownContentType.properties  (%chrome/mozapps/downloads/unknownContentType.properties)
   locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd         (%chrome/mozapps/downloads/unknownContentType.dtd)
   locale/@AB_CD@/mozapps/downloads/settingsChange.dtd             (%chrome/mozapps/downloads/settingsChange.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
   locale/@AB_CD@/mozapps/extensions/extensions.dtd                (%chrome/mozapps/extensions/extensions.dtd)
 #ifndef MOZ_FENNEC
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -314,29 +314,16 @@ CheckStringFlag(const nsSubstring& aFlag
     } else {
       aResult = comparison ? eBad : eOK;
     }
   }
 
   return true;
 }
 
-static bool
-CheckOsFlag(const nsSubstring& aFlag, const nsSubstring& aData,
-            const nsSubstring& aValue, TriState& aResult)
-{
-  bool result = CheckStringFlag(aFlag, aData, aValue, aResult);
-#if defined(XP_UNIX) && !defined(XP_DARWIN) && !defined(ANDROID)
-  if (result && aResult == eBad) {
-    result = CheckStringFlag(aFlag, aData, NS_LITERAL_STRING("likeunix"), aResult);
-  }
-#endif
-  return result;
-}
-
 /**
  * Check for a modifier flag of the following form:
  *   "flag=version"
  *   "flag<=version"
  *   "flag<version"
  *   "flag>=version"
  *   "flag>version"
  * @param aFlag The flag to compare.
@@ -673,17 +660,17 @@ ParseManifest(NSLocationType aType, File
     int flags = 0;
 
     while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) &&
            ok) {
       ToLowerCase(token);
       NS_ConvertASCIItoUTF16 wtoken(token);
 
       if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||
-          CheckOsFlag(kOs, wtoken, osTarget, stOs) ||
+          CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
           CheckStringFlag(kABI, wtoken, abi, stABI) ||
           CheckStringFlag(kProcess, wtoken, process, stProcess) ||
           CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
           CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
           CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
         continue;
       }