Backed out 2 changesets (bug 1403519) for bustage on \python\mozbuild\mozbuild\test\frontend\test_reader.py on a CLOSED TREE

Backed out changeset f53f8adcd578 (bug 1403519)
Backed out changeset 5b293bcd3fc7 (bug 1403519)

browser/base/moz.build

@@ -9,9 +9,6 @@ with Files("**"):
 
 SPHINX_TREES['sslerrorreport'] = 'content/docs/sslerrorreport'
 
-with Files('content/docs/sslerrorreport/**'):
-    SCHEDULES.exclusive = ['docs']
-
 MOCHITEST_MANIFESTS += [
     'content/test/general/mochitest.ini',
 ]

browser/experiments/moz.build

@@ -19,6 +19,3 @@ EXTRA_JS_MODULES.experiments += [
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
 
 SPHINX_TREES['experiments'] = 'docs'
-
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']

browser/moz.build

@@ -8,9 +8,6 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 SPHINX_TREES['browser'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 DIRS += [
     'base',
     'components',

build/moz.build

@@ -10,9 +10,6 @@ with Files('**'):
 # This cannot be named "build" because of bug 922191.
 SPHINX_TREES['buildsystem'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['win32']
     if CONFIG['WIN64_CARGO_LINKER']:

dom/bindings/moz.build

@@ -149,15 +149,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 SPHINX_TREES['webidl'] = 'docs'
-
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 SPHINX_PYTHON_PACKAGE_DIRS += ['mozwebidlcodegen']
 
-with Files('mozwebidlcodegen/**.py'):
-    SCHEDULES.inclusive += ['docs']
-
 if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
     # This is needed for Window.webidl
     DEFINES['HAVE_SIDEBAR'] = True

gfx/moz.build

@@ -40,6 +40,3 @@ if CONFIG['ENABLE_TESTS']:
 TEST_DIRS += ['tests']
 
 SPHINX_TREES['gfx'] = 'docs'
-
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']

mobile/android/moz.build

@@ -67,6 +67,3 @@ TEST_DIRS += [
 ]
 
 SPHINX_TREES['fennec'] = 'docs'
-
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']

moz.build

@@ -56,16 +56,7 @@ with Files('**/Makefile.in'):
     FINAL = True
 
 with Files("**/*.js"):
-    SCHEDULES.inclusive += ['test-verify', 'docs']
-
-with Files("**/*.jsm"):
-    SCHEDULES.inclusive += ['docs']
-
-with Files("**/*.rst"):
-    SCHEDULES.inclusive += ['docs']
-
-with Files("**/*.md"):
-    SCHEDULES.inclusive += ['docs']
+    SCHEDULES.inclusive += ['test-verify']
 
 with Files("**/*.html"):
     SCHEDULES.inclusive += ['test-verify']

python/moz.build

@@ -37,14 +37,8 @@ SPHINX_PYTHON_PACKAGE_DIRS += [
     'mozversioncontrol/mozversioncontrol',
 ]
 
-with Files('**.py'):
-    SCHEDULES.inclusive += ['docs']
-
 SPHINX_TREES['mach'] = 'mach/docs'
 
-with Files('mach/docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 PYTHON_UNITTEST_MANIFESTS += [
     'mach/mach/test/python.ini',
     'mozbuild/dumbmake/test/python.ini',

python/mozbuild/mozbuild/frontend/context.py

@@ -848,9 +848,10 @@ class Schedules(object):
         elif other._exclusive == schedules.EXCLUSIVE_COMPONENTS:
             rv._exclusive = self._exclusive
         else:
-            # in a case where two SCHEDULES.exclusive set different values, take
-            # the later one; this acts the way we expect assignment to work.
-            rv._exclusive = other._exclusive
+            msg = 'Two Files sections have set SCHEDULES.exclusive to different' \
+                'values; these cannot be combined: {} and {}'
+            msg = msg.format(self._exclusive, other._exclusive)
+            raise ValueError(msg)
         return rv
 
 

python/mozbuild/mozbuild/schedules.py

@@ -11,12 +11,7 @@ from __future__ import absolute_import, unicode_literals, print_function
 
 # TODO: ideally these lists could be specified in moz.build itself
 
-# Inclusive components are those which are scheduled when certain files are
-# changed, but do not run by default.  These are generally added to
-# `SCHEDULES.inclusive` using `+=`, but can also be used as exclusive
-# components for files which *only* affect the named component.
 INCLUSIVE_COMPONENTS = [
-    'docs',
     'py-lint',
     'js-lint',
     'yaml-lint',
@@ -28,10 +23,6 @@ INCLUSIVE_COMPONENTS = [
 ]
 INCLUSIVE_COMPONENTS = sorted(INCLUSIVE_COMPONENTS)
 
-# Exclusive components are those which are scheduled by default, but for which
-# some files *only* affect that component.  For example, most files affect all
-# platforms, but platform-specific files exclusively affect a single platform.
-# These components are assigned to `SCHEDULES.exclusive` with `=`.
 EXCLUSIVE_COMPONENTS = [
     # os families
     'android',

taskcluster/ci/source-test/doc.yml

@@ -19,8 +19,14 @@ generate:
             cd /builds/worker/checkouts/gecko &&
             ./mach doc --outdir docs-out --no-open --archive
         sparse-profile: sphinx-docs
-    optimization:
-        skip-unless-schedules: [docs]
+    when:
+        files-changed:
+            - '**/*.py'
+            - '**/*.rst'
+            - '**/*.md'
+            - 'tools/docs/**'
+            - '**/*.js'
+            - '**/*.jsm'
 
 upload:
     description: Generate and upload the Sphinx documentation
@@ -41,5 +47,8 @@ upload:
         sparse-profile: sphinx-docs
     scopes:
         - secrets:get:project/releng/gecko/build/level-{level}/gecko-docs-upload
-    optimization:
-        skip-unless-schedules: [docs]
+    when:
+        files-changed:
+            - '**/*.py'
+            - '**/*.rst'
+            - 'tools/docs/**'

taskcluster/docs/optimization-schedules.rst

@@ -78,14 +78,6 @@ For cases where an inclusive component is affected exclusively (such as the pyth
     with Files('**/pep8rc'):
         SCHEDULES.exclusive = ['py-lint']
 
-If multiple stanzas set ``SCHEDULES.exclusive``, the last one will take precedence.  Thus the following will set ``SCHEDULES.exclusive`` to ``hpux`` for all files except those under ``docs/``.
-
-    with Files('**'):
-        SCHEDULES.exclusive = ['hpux']
-
-    with Files('**/docs'):
-        SCHEDULES.exclusive = ['docs']
-
 Task Annotation
 :::::::::::::::
 

taskcluster/moz.build

@@ -28,6 +28,3 @@ PYTHON_UNITTEST_MANIFESTS += [
 ]
 SPHINX_TREES['taskcluster'] = 'docs'
 SPHINX_PYTHON_PACKAGE_DIRS += ['taskgraph']
-
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']

testing/geckodriver/moz.build

@@ -12,6 +12,3 @@ with Files("**"):
     BUG_COMPONENT = ("Testing", "Marionette")
 
 SPHINX_TREES["geckodriver"] = "doc"
-
-with Files('doc/**'):
-    SCHEDULES.exclusive = ['docs']

testing/marionette/moz.build

@@ -18,6 +18,3 @@ with Files("harness/**"):
     SCHEDULES.exclusive = ["marionette", "firefox-ui"]
 
 SPHINX_TREES["marionette"] = "doc"
-
-with Files('doc/**'):
-    SCHEDULES.exclusive = ['docs']

testing/mozbase/moz.build

@@ -50,8 +50,5 @@ TEST_HARNESS_FILES.mozbase += [
 
 SPHINX_TREES['/mozbase'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 with Files('**'):
     BUG_COMPONENT = ('Testing', 'Mozbase')

toolkit/components/crashes/moz.build

@@ -6,9 +6,6 @@
 
 SPHINX_TREES['crash-manager'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 XPIDL_MODULE = 'toolkit_crashservice'
 
 XPIDL_SOURCES += [

toolkit/components/extensions/moz.build

@@ -92,7 +92,4 @@ XPCSHELL_TESTS_MANIFESTS += [
 
 SPHINX_TREES['webextensions'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 include('/ipc/chromium/chromium-config.mozbuild')

toolkit/components/payments/moz.build

@@ -20,9 +20,6 @@ MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
 
 SPHINX_TREES['docs'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 TESTING_JS_MODULES += [
     'test/PaymentTestUtils.jsm',
 ]

toolkit/components/telemetry/moz.build

@@ -24,9 +24,6 @@ LOCAL_INCLUDES += [
 
 SPHINX_TREES['telemetry'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
 

toolkit/components/url-classifier/moz.build

@@ -93,7 +93,4 @@ if CONFIG['NIGHTLY_BUILD'] or CONFIG['MOZ_DEBUG']:
 
 SPHINX_TREES['url-classifier'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 include('/ipc/chromium/chromium-config.mozbuild')

toolkit/crashreporter/moz.build

@@ -6,9 +6,6 @@
 
 SPHINX_TREES['crashreporter'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 EXPORTS += [
     'nsExceptionHandler.h',
 ]

toolkit/modules/moz.build

@@ -165,9 +165,6 @@ TESTING_JS_MODULES += [
 
 SPHINX_TREES['toolkit_modules'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 EXTRA_JS_MODULES += [
     'addons/MatchURLFilters.jsm',
     'addons/WebNavigation.jsm',

toolkit/modules/subprocess/moz.build

@@ -30,6 +30,3 @@ else:
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
 
 SPHINX_TREES['toolkit_modules/subprocess'] = ['docs']
-
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']

toolkit/mozapps/extensions/moz.build

@@ -6,9 +6,6 @@
 
 SPHINX_TREES['addon-manager'] = 'docs'
 
-with Files('docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
     DEFINES['MOZ_FENNEC'] = True
 

tools/moz.build

@@ -21,7 +21,6 @@ with Files("coverity/**"):
 
 with Files("docs/**"):
     BUG_COMPONENT = ("Core", "Build Config")
-    SCHEDULES.exclusive = ['docs']
 
 with Files("lint/**"):
     BUG_COMPONENT = ("Testing", "Lint")
@@ -48,20 +47,9 @@ with Files("update-packaging/**"):
     BUG_COMPONENT = ("Release Engineering", "Other")
 
 SPHINX_TREES['lint'] = 'lint/docs'
-
-with Files('lint/docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 SPHINX_TREES['compare-locales'] = 'compare-locales/docs'
-
-with Files('compare-locales/docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 SPHINX_TREES['try'] = 'tryselect/docs'
 
-with Files('tryselect/docs/**'):
-    SCHEDULES.exclusive = ['docs']
-
 CRAMTEST_MANIFESTS += [
     'tryselect/test/cram.ini',
 ]