Move config command next to compile as they are related

Author: screamerbg

mbed/mbed.py

@@ -1860,6 +1860,50 @@ def compile(toolchain=None, mcu=None, source=False, build=False, clean=False, su
               env=env)
 
 
+# 'config' command (calls into tools/get_config.py)
+@subcommand('config',
+    dict(name=['-t', '--toolchain'], help='Compile toolchain. Example: ARM, uARM, GCC_ARM, IAR'),
+    dict(name=['-m', '--mcu'], help='Compile target. Example: K64F, NUCLEO_F401RE, NRF51822...'),
+    dict(name='--source', action='append', help='Source directory. Default: . (current dir)'),
+    dict(name='--prefix', action='append', help='Restrict listing to parameters that have this prefix'),
+    help='Display program\'s compile configuration.')
+def config(toolchain=None, mcu=None, source=False, prefix=None):
+    # Find the root of the program
+    program = Program(os.getcwd(), True)
+    # Remember the original path. this is needed for compiling only the libraries and tests for the current folder.
+    orig_path = os.getcwd()
+
+    with cd(program.path):
+        mbed_tools_path = program.get_tools_dir()
+        if not mbed_tools_path:
+            error('The mbed tools were not found in "%s". \n Run `mbed deploy` to install dependencies and tools. ' % program.path, -1)
+        tools_dir = os.path.abspath(mbed_tools_path)
+
+        if not os.path.isfile(os.path.join(tools_dir, 'get_config.py')):
+            error("'get_config_py' not found in tools/. Please update mbed-os to get the latest tools.", -1)
+
+        target = mcu if mcu else program.get_cfg('TARGET')
+        if target is None:
+            error('Please specify compile target using the -m switch or set default target using command "target"', 1)
+
+        tchain = toolchain if toolchain else program.get_cfg('TOOLCHAIN')
+        if tchain is None:
+            error('Please specify compile toolchain using the -t switch or set default toolchain using command "toolchain"', 1)
+
+        env = os.environ.copy()
+        env['PYTHONPATH'] = os.path.abspath(program.path)
+
+    if not source or len(source) == 0:
+        source = [os.path.relpath(program.path, orig_path)]
+
+    popen(['python', os.path.join(tools_dir, 'get_config.py')]
+          + ['-t', tchain, '-m', target]
+          + list(chain.from_iterable(izip(repeat('--source'), source)))
+          + (['-v'] if verbose else [])
+          + (list(chain.from_iterable(izip(repeat('--prefix'), prefix))) if prefix else []),
+          env=env)
+
+
 # Test command
 @subcommand('test',
     dict(name=['-l', '--list'], dest='tlist', action='store_true', help='List all of the available tests'),
@@ -1983,48 +2027,6 @@ def default_(name, value=None, unset=False):
         value = g.get_cfg(var)
         action(('%s' % value) if value else 'No global %s set' % (name))
 
-# 'config' command (calls into tools/get_config.py)
-@subcommand('config',
-    dict(name=['-t', '--toolchain'], help='Compile toolchain. Example: ARM, uARM, GCC_ARM, IAR'),
-    dict(name=['-m', '--mcu'], help='Compile target. Example: K64F, NUCLEO_F401RE, NRF51822...'),
-    dict(name='--source', action='append', help='Source directory. Default: . (current dir)'),
-    dict(name='--prefix', action='append', help='Restrict listing to parameters that have this prefix'),
-    help='Display the project configuration.')
-def config(toolchain=None, mcu=None, source=False, prefix=None):
-    # Find the root of the program
-    program = Program(os.getcwd(), True)
-    # Remember the original path. this is needed for compiling only the libraries and tests for the current folder.
-    orig_path = os.getcwd()
-
-    with cd(program.path):
-        mbed_tools_path = program.get_tools_dir()
-        if not mbed_tools_path:
-            error('The mbed tools were not found in "%s". \n Run `mbed deploy` to install dependencies and tools. ' % program.path, -1)
-        tools_dir = os.path.abspath(mbed_tools_path)
-
-        if not os.path.isfile(os.path.join(tools_dir, 'get_config.py')):
-            error("'get_config_py' not found in tools/. Please update mbed-os to get the latest tools.", -1)
-
-        target = mcu if mcu else program.get_cfg('TARGET')
-        if target is None:
-            error('Please specify compile target using the -m switch or set default target using command "target"', 1)
-
-        tchain = toolchain if toolchain else program.get_cfg('TOOLCHAIN')
-        if tchain is None:
-            error('Please specify compile toolchain using the -t switch or set default toolchain using command "toolchain"', 1)
-
-        env = os.environ.copy()
-        env['PYTHONPATH'] = os.path.abspath(program.path)
-
-    if not source or len(source) == 0:
-        source = [os.path.relpath(program.path, orig_path)]
-
-    popen(['python', os.path.join(tools_dir, 'get_config.py')]
-          + ['-t', tchain, '-m', target]
-          + list(chain.from_iterable(izip(repeat('--source'), source)))
-          + (['-v'] if verbose else [])
-          + (list(chain.from_iterable(izip(repeat('--prefix'), prefix))) if prefix else []),
-          env=env)
 
 # Parse/run command
 if len(sys.argv) <= 1: