bug 1303028, clean up l10n configurations, r=Fallen
authorAxel Hecht <axel@pike.org>
Thu, 15 Sep 2016 16:19:10 +0200
changeset 22884 830d0c78b66315d9a78a687da644559dc748bb95
parent 22883 41b746e5a39cd5c51ca3f8ae9b26d1e0fc2c8590
child 22885 a7312b12f00f6b39084b768a6252669ed641d0b4
push id1830
push userclokep@gmail.com
push dateMon, 19 Sep 2016 17:42:07 +0000
treeherdercomm-aurora@e86ede57183b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1303028
bug 1303028, clean up l10n configurations, r=Fallen Remove old configurations for 1.9.x etc. Make filter.py return "ignore" and "error" to make it easier to understand, also update for new directories in toolkit. Also, remove the [extra] entries, they're not used in compare-locales, and the automation won't see the given paths with 'mozilla' prefix either. MozReview-Commit-ID: 6gYN80NeQGj
mail/locales/filter.py
mail/locales/l10n-1.9.2.ini
mail/locales/l10n-aurora.ini
mail/locales/l10n-beta.ini
mail/locales/l10n-central.ini
mail/locales/l10n-miramar.ini
mail/locales/l10n.ini
--- a/mail/locales/filter.py
+++ b/mail/locales/filter.py
@@ -1,21 +1,25 @@
-def test(mod, path, entity = None):
+def test(mod, path, entity=None):
   import re
   # ignore anything but Thunderbird
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
+                 "devtools/shared",
                  "mail", "chat", "editor/ui", "extensions/spellcheck",
                  "other-licenses/branding/thunderbird"):
-    return False
+    return "ignore"
 
   # ignore MOZ_LANGPACK_CONTRIBUTORS
   if mod == "mail" and path == "defines.inc" and \
      entity == "MOZ_LANGPACK_CONTRIBUTORS":
-    return False
+    return "ignore"
   # ignore dictionaries
   if mod == "extensions/spellcheck":
-    return False
+    return "ignore"
 
   if path == "chrome/messenger-region/region.properties":
-    return not (re.match(r"browser\.search\.order\.[1-9]", entity)) 
+    return ("ignore" if (re.match(r"browser\.search\.order\.[1-9]", entity))
+            else "error")
 
   # ignore search plugins
-  return not (re.match(r"searchplugins\/.+\.xml", path))
+  if re.match(r"searchplugins\/.+\.xml", path):
+    return "ignore"
+  return "error"
deleted file mode 100644
--- a/mail/locales/l10n-1.9.2.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[general]
-depth = ../..
-all = mail/locales/all-locales
-
-[compare]
-dirs = mail
-    other-licenses/branding/thunderbird
-    editor/ui
-
-[includes]
-# non-central apps might want to use %(topsrcdir)s here, or other vars
-# RFE: that needs to be supported by compare-locales, too, though
-toolkit = mozilla/toolkit/locales/l10n.ini
-
-[extras]
-dirs = mozilla/extensions/spellcheck
-
-[include_toolkit]
-type = hg
-mozilla = releases/mozilla-1.9.2
-repo = http://hg.mozilla.org/
-l10n.ini = toolkit/locales/l10n.ini
--- a/mail/locales/l10n-aurora.ini
+++ b/mail/locales/l10n-aurora.ini
@@ -8,16 +8,13 @@ dirs = mail
     other-licenses/branding/thunderbird
     editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 
-[extras]
-dirs = mozilla/extensions/spellcheck
-
 [include_toolkit]
 type = hg
 mozilla = releases/mozilla-aurora
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
--- a/mail/locales/l10n-beta.ini
+++ b/mail/locales/l10n-beta.ini
@@ -8,16 +8,13 @@ dirs = mail
     other-licenses/branding/thunderbird
     editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 
-[extras]
-dirs = mozilla/extensions/spellcheck
-
 [include_toolkit]
 type = hg
 mozilla = releases/mozilla-beta
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
--- a/mail/locales/l10n-central.ini
+++ b/mail/locales/l10n-central.ini
@@ -8,16 +8,13 @@ dirs = mail
     other-licenses/branding/thunderbird
     editor/ui
 
 [includes]
 # non-central apps might want to use %(topsrcdir)s here, or other vars
 # RFE: that needs to be supported by compare-locales, too, though
 toolkit = mozilla/toolkit/locales/l10n.ini
 
-[extras]
-dirs = mozilla/extensions/spellcheck
-
 [include_toolkit]
 type = hg
 mozilla = mozilla-central
 repo = http://hg.mozilla.org/
 l10n.ini = toolkit/locales/l10n.ini
deleted file mode 100644
--- a/mail/locales/l10n-miramar.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[general]
-depth = ../..
-all = mail/locales/all-locales
-
-[compare]
-dirs = mail
-    other-licenses/branding/thunderbird
-    editor/ui
-
-[includes]
-# non-central apps might want to use %(topsrcdir)s here, or other vars
-# RFE: that needs to be supported by compare-locales, too, though
-toolkit = mozilla/toolkit/locales/l10n.ini
-
-[extras]
-dirs = mozilla/extensions/spellcheck
-
-[include_toolkit]
-type = hg
-mozilla = releases/mozilla-miramar
-repo = http://hg.mozilla.org/
-l10n.ini = toolkit/locales/l10n.ini
--- a/mail/locales/l10n.ini
+++ b/mail/locales/l10n.ini
@@ -4,20 +4,12 @@ all = mail/locales/all-locales
 
 [compare]
 dirs = mail
     chat
     other-licenses/branding/thunderbird
     editor/ui
 
 [includes]
-# non-central apps might want to use %(topsrcdir)s here, or other vars
-# RFE: that needs to be supported by compare-locales, too, though
+# include toolkit from mozilla.
+# Don't specify which, use l10n-central.ini and friends if you're
+# not working on a local check-out
 toolkit = mozilla/toolkit/locales/l10n.ini
-
-[extras]
-dirs = mozilla/extensions/spellcheck
-
-[include_toolkit]
-type = hg
-mozilla = releases/mozilla-1.9.1
-repo = http://hg.mozilla.org/
-l10n.ini = toolkit/locales/l10n.ini