Set default toolchain and target only after successful compile/test/export execution

Author: screamerbg

mbed/mbed.py

@@ -35,7 +35,7 @@
 
 
 # Application version
-ver = '0.7.13'
+ver = '0.7.14'
 
 # Default paths to Mercurial and Git
 hg_cmd = 'hg'
@@ -1253,27 +1253,28 @@ def get_mcu(self, mcu=None):
         target = mcu if mcu else target_cfg
         if target is None:
             error('Please specify compile target using the -m switch or set default target using command "target"', 1)
-        elif not target_cfg:
-            self.set_cfg('TARGET', target)
         return target
 
     def get_toolchain(self, toolchain=None):
         toolchain_cfg = self.get_cfg('TOOLCHAIN')
         tchain = toolchain if toolchain else toolchain_cfg
         if tchain is None:
             error('Please specify compile toolchain using the -t switch or set default toolchain using command "toolchain"', 1)
-        elif not toolchain_cfg:
-            self.set_cfg('TOOLCHAIN', tchain)
         return tchain
 
+    def set_defaults(self, target=None, toolchain=None):
+        if target and not self.get_cfg('TARGET'):
+            self.set_cfg('TARGET', target)
+        if toolchain and not self.get_cfg('TOOLCHAIN'):
+            self.set_cfg('TOOLCHAIN', toolchain)
+
     def get_macros(self):
         macros = []
         if os.path.isfile('MACROS.txt'):
             with open('MACROS.txt') as f:
                 macros = f.read().splitlines()
         return macros
 
-
 # Global class, used for global config
 class Global(object):
     def __init__(self):
@@ -1953,6 +1954,8 @@ def compile(toolchain=None, mcu=None, source=False, build=False, compile_library
               + args,
               env=env)
 
+    program.set_defaults(target=target, toolchain=tchain)
+
 
 # Test command
 @subcommand('test',
@@ -2033,6 +2036,8 @@ def test_(toolchain=None, mcu=None, compile_list=False, run_list=False, compile_
                   + args,
                   env=env)
 
+    program.set_defaults(target=target, toolchain=tchain)
+
 
 # Export command
 @subcommand('export',
@@ -2078,6 +2083,8 @@ def export(ide=None, mcu=None, source=False, clean=False, supported=False):
           + args,
           env=env)
 
+    program.set_defaults(target=target)
+
 
 # Test command
 @subcommand('detect',

setup.py

@@ -19,7 +19,7 @@ def read(fname):
 setup(
     name="mbed-cli",
     packages=["mbed"],
-    version="0.7.13",
+    version="0.7.14",
     url='http://github.com/ARMmbed/mbed-cli',
     author='ARM mbed',
     author_email='[email protected]',