# HG changeset patch
# User Ian Neal <iann_cvs@blueyonder.co.uk>
# Date 1608742429 0
# Parent  89afa85e3332fa239892ce2cea90fd8d40159c8e
Bug 1659298 - Get rid of distribution extensions in favor of application global - extra removals and fix debugQA. r=frg a=frg

diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -74,18 +74,17 @@ libs:: $(MOZ_APP_NAME).1
 	$(INSTALL) $< $(DIST)/man/man1
 
 GARBAGE += $(MOZ_APP_NAME).1
 GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, all.js mailnews.js suite-prefs.js)
 endif
 
 # Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
 # Extensions that appear in dist/bin/extensions will get bundled with the
-# application, ones that appear in dist/bin/distribution/extensions will be
-# copied to the profile in installed builds.
+# application.
 # NOTE: This is a hack to run this at the end of compilation, would be nicer
 # if this was done right away for built-in extensions in omnijar mode.
 
 ABS_STAGE = $(abspath $(STAGEDIST))
 
 define _PACKAGE_EXTENSIONS
 @echo "Packaging $(dir)..."
 if test -d "$(ABS_STAGE)/$(dir)"; then \
@@ -100,19 +99,17 @@ endef # do not remove the blank line!
 # Unused for now. All extensions are being packed.
 DONOTPACK = {9999999%
 
 pack-ext: $(STAGEDIST)
 	@echo "Packaging extensions..."
 	$(foreach dir,$(filter-out $(DONOTPACK),$(subst $(STAGEDIST)/,,$(wildcard $(STAGEDIST)/*))),$(_PACKAGE_EXTENSIONS))
 
 tools::
-	$(NSINSTALL) -D $(DIST)/bin/distribution/extensions
 	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/extensions"
-	@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/distribution/extensions"
 
 # Additional macOS build steps.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
 
 ifdef MOZ_DEBUG
 MAC_APP_NAME := $(MAC_APP_NAME)Debug
diff --git a/suite/extensions/debugQA/jar.mn b/suite/extensions/debugQA/jar.mn
--- a/suite/extensions/debugQA/jar.mn
+++ b/suite/extensions/debugQA/jar.mn
@@ -1,13 +1,13 @@
 # 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/.
 
-[distribution/extensions/debugQA@mozilla.org] debugqa.jar:
+[extensions/debugQA@mozilla.org] debugqa.jar:
 % content debugqa %content/debugqa/
 % overlay chrome://navigator/content/navigatorOverlay.xul chrome://debugqa/content/debugQAMenuOverlay.xul
 % overlay chrome://editor/content/editor.xul chrome://debugqa/content/debugQAEditorOverlay.xul
 % overlay chrome://navigator/content/navigator.xul chrome://debugqa/content/debugQANavigatorOverlay.xul
   content/debugqa/debugQAEditorOverlay.js                 (content/debugQAEditorOverlay.js)
   content/debugqa/debugQAEditorOverlay.xul                (content/debugQAEditorOverlay.xul)
   content/debugqa/debugQAMenuOverlay.js                   (content/debugQAMenuOverlay.js)
   content/debugqa/debugQAMenuOverlay.xul                  (content/debugQAMenuOverlay.xul)
diff --git a/suite/extensions/debugQA/locales/jar.mn b/suite/extensions/debugQA/locales/jar.mn
--- a/suite/extensions/debugQA/locales/jar.mn
+++ b/suite/extensions/debugQA/locales/jar.mn
@@ -1,10 +1,10 @@
 #filter substitution
 # 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/.
 
 
-[distribution/extensions/debugQA@mozilla.org] debugqa.jar:
+[extensions/debugQA@mozilla.org] debugqa.jar:
 % locale debugQA @AB_CD@ %locale/@AB_CD@/debugQA/
   locale/@AB_CD@/debugQA/debugQAEditorOverlay.dtd           (en-US/debugQAEditorOverlay.dtd)
   locale/@AB_CD@/debugQA/debugQANavigatorOverlay.properties (en-US/debugQANavigatorOverlay.properties)
diff --git a/suite/extensions/debugQA/moz.build b/suite/extensions/debugQA/moz.build
--- a/suite/extensions/debugQA/moz.build
+++ b/suite/extensions/debugQA/moz.build
@@ -3,13 +3,13 @@
 # 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/.
 
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
 
 DIRS += ['locales']
 
-FINAL_TARGET_PP_FILES.distribution.extensions['debugQA@mozilla.org'] += [
+FINAL_TARGET_PP_FILES.extensions['debugQA@mozilla.org'] += [
   'install.rdf.in'
 ]
 
 JAR_MANIFESTS += ['jar.mn']
diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -141,19 +141,17 @@ endif
 
 package-win32-installer: $(SUBMAKEFILES)
 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
 
 repackage-extensions: $(STAGEDIST)
 ifdef MOZ_IRC
 	$(MAKE) -C $(DEPTH)/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
 endif
-	$(NSINSTALL) -D $(STAGEDIST)/distribution/extensions
 	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/extensions;
-	$(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST)/distribution/extensions;
 
 langpack: langpack-$(AB_CD)
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack and installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.
 installers-%: IS_LANGUAGE_REPACK=1
 installers-%: