Bug 1103646 - Build XPIs in misc tier draft
authorGregory Szorc <gps@mozilla.com>
Sun, 23 Nov 2014 14:26:48 -0800
changeset 228949 ed0a585a5b5e651d3544351ffc79d32f29b71601
parent 228948 c9cfa9b91deab864d4e0a362443cde961f29bcd2
child 504842 a37ef2f348441165845fa2a0542d9901b9a03fdd
push id131
push usergszorc@mozilla.com
push dateSun, 23 Nov 2014 22:28:15 +0000
bugs1103646
milestone36.0a1
Bug 1103646 - Build XPIs in misc tier libs is being phased out. Let's generate these XPIs during the misc tier.
addon-sdk/Makefile.in
addon-sdk/moz.build
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -7,16 +7,17 @@ ADDONSRC = $(srcdir)/$(TESTADDONS)
 TESTROOT = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/jetpack-addon/$(relativesrcdir)/$(TESTADDONS)
 
 # Build a list of the test add-ons
 ADDONS = $(patsubst $(ADDONSRC)/%/package.json,$(TESTADDONS)/%.xpi,$(wildcard $(ADDONSRC)/*/package.json))
 
 INSTALL_TARGETS += test_addons
 test_addons_FILES = $(ADDONS)
 test_addons_DEST = $(TESTROOT)
+test_addons_TARGET := misc
 
 sinclude $(topsrcdir)/config/rules.mk
 
 # This can switch to just zipping the files when native jetpacks land
 $(TESTADDONS)/%.xpi: FORCE $(call mkdir_deps,$(CURDIR)/$(TESTADDONS)) $(ADDONSRC)/%
 	$(PYTHON) $(srcdir)/source/bin/cfx xpi --pkgdir=$(lastword $^) --output-file=$@
 
 #libs:: $(ADDONS)
--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@@ -4,16 +4,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+HAS_MISC_RULE = True
+
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 JETPACK_PACKAGE_MANIFESTS += ['source/test/jetpack-package.ini']
 JETPACK_ADDON_MANIFESTS += ['source/test/addons/jetpack-addon.ini']
 
 EXTRA_JS_MODULES.sdk += [
     'source/app-extension/bootstrap.js',
 ]