Bug 1261473 - Remove INSTALL_TARGETS from addon-sdk/Makefile.in; r=chmanchester
authorMike Shal <mshal@mozilla.com>
Thu, 31 Mar 2016 16:07:13 -0400
changeset 291754 42ba1f78bde5d7f9cdb9decfb69a8734afca07a8
parent 291753 ca5d7ac54447ad3e0440c18b5fd799d94b8932da
child 291755 01301f098c43a7871515538df52a0e3b2ae9dbfa
push id74659
push usermshal@mozilla.com
push dateTue, 05 Apr 2016 18:44:35 +0000
treeherdermozilla-inbound@6944634621fc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1261473
milestone48.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
Bug 1261473 - Remove INSTALL_TARGETS from addon-sdk/Makefile.in; r=chmanchester MozReview-Commit-ID: CWsimFT6MFv
addon-sdk/Makefile.in
addon-sdk/moz.build
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -1,32 +1,21 @@
 # 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/.
 
 TESTADDONS = source/test/addons
 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 --no-strip-xpi --pkgdir=$(lastword $^) --output-file=$@
 
-#libs:: $(ADDONS)
-
 TEST_FILES = \
   $(srcdir)/source/app-extension \
   $(srcdir)/source/bin \
   $(srcdir)/source/python-lib \
   $(srcdir)/source/test \
   $(srcdir)/source/package.json \
   $(srcdir)/source/mapping.json \
   $(NULL)
--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@@ -11,16 +11,65 @@
 
 # Makefile.in uses a misc target through test_addons_TARGET.
 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']
 
+addons = [
+    'addon-manager',
+    'author-email',
+    'child_process',
+    'chrome',
+    'content-permissions',
+    'contributors',
+    'curly-id',
+    'developers',
+    'e10s-content',
+    'e10s-l10n',
+    'e10s-remote',
+    'e10s-tabs',
+    'e10s',
+    'l10n-properties',
+    'l10n',
+    'layout-change',
+    'main',
+    'name-in-numbers-plus',
+    'name-in-numbers',
+    'packaging',
+    'packed',
+    'page-mod-debugger-post',
+    'page-mod-debugger-pre',
+    'page-worker',
+    'places',
+    'predefined-id-with-at',
+    'preferences-branch',
+    'private-browsing-supported',
+    'remote',
+    'require',
+    'self',
+    'simple-prefs-l10n',
+    'simple-prefs-regression',
+    'simple-prefs',
+    'standard-id',
+    'tab-close-on-startup',
+    'toolkit-require-reload',
+    'translators',
+    'unsafe-content-script',
+]
+
+addons = ['source/test/addons/%s.xpi' % f for f in addons]
+GENERATED_FILES += addons
+
+TEST_HARNESS_FILES.testing.mochitest['jetpack-addon']['addon-sdk'].source.test.addons += [
+    '!%s' % f for f in addons
+]
+
 EXTRA_JS_MODULES.sdk += [
     'source/app-extension/bootstrap.js',
 ]
 
 EXTRA_JS_MODULES.sdk.system += [
     'source/modules/system/Startup.js',
 ]