Bug 1182722 - Add DevTools folders to l10n machinery. r=glandium,Pike draft
authorJ. Ryan Stinnett <jryans@gmail.com>
Thu, 22 Oct 2015 14:26:33 -0500
changeset 302768 648cd71d3249491ea1fc7822af98b4e39fd79957
parent 302767 641885171472e02eed37ef623896c0fd58405041
child 510442 f81162335bc8aa19ca27712e193ab868c5c0113c
push id6675
push userjryans@gmail.com
push dateThu, 22 Oct 2015 19:29:33 +0000
reviewersglandium, Pike
bugs1182722
milestone44.0a1
Bug 1182722 - Add DevTools folders to l10n machinery. r=glandium,Pike
b2g/locales/Makefile.in
b2g/locales/filter.py
b2g/locales/l10n.ini
browser/locales/Makefile.in
browser/locales/filter.py
browser/locales/l10n.ini
mobile/android/locales/filter.py
mobile/android/locales/l10n.ini
mobile/locales/Makefile.in
mobile/locales/filter.py
mobile/locales/l10n.ini
--- a/b2g/locales/Makefile.in
+++ b/b2g/locales/Makefile.in
@@ -62,16 +62,17 @@ libs::
 	fi
 
 NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$*
 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -C ../../devtools/shared/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 # Tailored target to just add the chrome processing for multi-locale builds
 chrome-%:
 	@$(MAKE) chrome AB_CD=$*
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
 
--- a/b2g/locales/filter.py
+++ b/b2g/locales/filter.py
@@ -3,12 +3,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 def test(mod, path, entity = None):
   import re
   # ignore anything but b2g and specific overloads from dom and toolkit
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
                  "mobile",
-                 "b2g"):
+                 "b2g",
+                 "devtools/shared"):
     return "ignore"
 
   return "error"
--- a/b2g/locales/l10n.ini
+++ b/b2g/locales/l10n.ini
@@ -3,11 +3,12 @@
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [general]
 depth = ../..
 all = b2g/locales/all-locales
 
 [compare]
 dirs = b2g
+    devtools/shared
 
 [includes]
 toolkit = toolkit/locales/l10n.ini
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -129,16 +129,18 @@ libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$*
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
 ifdef MOZ_WEBAPP_RUNTIME
 	@$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$*
 endif
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID=$(XPI_ROOT_APPID)
+	@$(MAKE) -C ../../devtools/shared/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID=$(XPI_ROOT_APPID)
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
 	@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
 	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
@@ -5,17 +5,18 @@
 def test(mod, path, entity = None):
   import re
   # ignore anything but Firefox
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
                  "browser", "webapprt",
                  "extensions/reporter", "extensions/spellcheck",
                  "other-licenses/branding/firefox",
                  "browser/branding/official",
-                 "services/sync"):
+                 "services/sync",
+                 "devtools/client", "devtools/shared"):
     return "ignore"
   if mod not in ("browser", "extensions/spellcheck"):
     # we only have exceptions for browser and extensions/spellcheck
     return "error"
   if not entity:
     # the only files to ignore are spell checkers and search
     if mod == "extensions/spellcheck":
       return "ignore"
--- a/browser/locales/l10n.ini
+++ b/browser/locales/l10n.ini
@@ -6,16 +6,18 @@
 depth = ../..
 all = browser/locales/all-locales
 
 [compare]
 dirs = browser
      extensions/reporter
      other-licenses/branding/firefox
      browser/branding/official
+     devtools/client
+     devtools/shared
 
 [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 = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
 webapprt = webapprt/locales/l10n.ini
 
--- a/mobile/android/locales/filter.py
+++ b/mobile/android/locales/filter.py
@@ -7,17 +7,18 @@ reported and l10n-merged.
 This needs to stay in sync with the copy in mobile/locales.
 """
 
 def test(mod, path, entity = None):
   import re
   # ignore anything but mobile, which is our local repo checkout name
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
                  "services/sync", "mobile",
-                 "mobile/android/base",  "mobile/android"):
+                 "mobile/android/base",  "mobile/android",
+                 "devtools/shared"):
     return "ignore"
 
   if mod not in ("mobile", "mobile/android"):
     # we only have exceptions for mobile*
     return "error"
   if mod == "mobile/android":
     if not entity:
       if (re.match(r"mobile-l10n.js", path) or
--- a/mobile/android/locales/l10n.ini
+++ b/mobile/android/locales/l10n.ini
@@ -7,12 +7,13 @@
 # that the dashboard picks them up.
 
 [general]
 depth = ../../..
 all = mobile/android/locales/all-locales
 
 [compare]
 dirs = mobile mobile/android mobile/android/base
+    devtools/shared
 
 [includes]
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -128,16 +128,17 @@ include $(topsrcdir)/config/rules.mk
 libs-preqs =\
   $(call mkdir-deps,$(DIST)/install) \
   $(NULL)
 
 libs-%: $(libs-preqs)
 	$(display-deps)
 	@$(MAKE) -C $(DEPTH)/toolkit/locales libs-$*
 	@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
+	@$(MAKE) -C $(DEPTH)/devtools/shared/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 # Tailored target to just add the chrome processing for multi-locale builds
 chrome-%:
 	$(display-deps)
 	@$(MAKE) -B searchplugins AB_CD=$*
--- a/mobile/locales/filter.py
+++ b/mobile/locales/filter.py
@@ -7,17 +7,18 @@ reported and l10n-merged.
 This needs to stay in sync with the copy in mobile/android/locales.
 """
 
 def test(mod, path, entity = None):
   import re
   # ignore anything but mobile, which is our local repo checkout name
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
                  "services/sync", "mobile",
-                 "mobile/android/base",  "mobile/android"):
+                 "mobile/android/base",  "mobile/android",
+                 "devtools/shared"):
     return "ignore"
 
   if mod not in ("mobile", "mobile/android"):
     # we only have exceptions for mobile*
     return "error"
   if mod == "mobile/android":
     if not entity:
       if (re.match(r"mobile-l10n.js", path) or
--- a/mobile/locales/l10n.ini
+++ b/mobile/locales/l10n.ini
@@ -8,12 +8,13 @@
 # mobile/android/locales/l10n.ini.
 
 [general]
 depth = ../..
 all = mobile/android/locales/all-locales
 
 [compare]
 dirs = mobile mobile/android mobile/android/base
+    devtools/shared
 
 [includes]
 toolkit = toolkit/locales/l10n.ini
 services_sync = services/sync/locales/l10n.ini