author | Gregory Szorc <gps@mozilla.com> |
Fri, 05 Oct 2012 12:13:18 -0700 | |
changeset 115641 | d04782dc009156e114f27da3a468321a99edc47b |
parent 115640 | 15c2bcb1a982e748f9f88be3976096cf5d31b07c |
child 115642 | 533f124453a058598ca736065ff277a1146385f0 |
push id | 1708 |
push user | akeybl@mozilla.com |
push date | Mon, 19 Nov 2012 21:10:21 +0000 |
treeherder | mozilla-beta@27b14fe50103 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jhammel |
bugs | 794509 |
milestone | 18.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
|
--- a/mach +++ b/mach @@ -33,16 +33,15 @@ SEARCH_PATHS = [ 'testing/mozbase/mozinfo', ] our_dir = os.path.dirname(os.path.abspath(__file__)) try: import mach.main except ImportError: - SEARCH_PATHS.reverse() sys.path[0:0] = [os.path.join(our_dir, path) for path in SEARCH_PATHS] import mach.main # All of the code is in a module because EVERYTHING IS A LIBRARY. mach = mach.main.Mach(our_dir) sys.exit(mach.run(sys.argv[1:]))
--- a/python/mach/mach/main.py +++ b/python/mach/mach/main.py @@ -17,21 +17,20 @@ from mozbuild.base import BuildConfig from mozbuild.config import ConfigSettings from mozbuild.logger import LoggingManager from mach.registrar import populate_argument_parser # Import sub-command modules # TODO Bug 794509 do this via auto-discovery. Update README once this is # done. -from mach.build import Build -from mach.settings import Settings -from mach.testing import Testing -from mach.warnings import Warnings - +from mach.commands.build import Build +from mach.commands.settings import Settings +from mach.commands.testing import Testing +from mach.commands.warnings import Warnings # Classes inheriting from ConfigProvider that provide settings. # TODO this should come from auto-discovery somehow. SETTINGS_PROVIDERS = [ BuildConfig, ] # Settings for argument parser that don't get proxied to sub-module. i.e. these