Bug 794509 - Part 2: Move mach command modules into a mach.commands s…

…ub-module; r=jhammel

This patch on its own will break mach. Part 3 will refactor mach's
loader to discover and load modules using a modified module finding
method.

mach

@@ -38,7 +38,6 @@ 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

python/mach/mach/main.py

@@ -22,11 +22,10 @@
 # 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.

python/mozbuild/setup.py

@@ -10,6 +10,6 @@
     name='mozbuild',
     description='Mozilla build system functionality.',
     license='MPL 2.0',
-    packages=['mozbuild'],
+    packages=['mach', 'mozbuild'],
     version=VERSION
 )