various fixes:

 * improve setup.py
 * improve debug program path suggestions
 * fix target error message
 * expand environment variables when executing debug commands

Author: James Crosby

setup.py

@@ -1,20 +1,20 @@
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
 # Utility function to cat in a file (used for the README)
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 setup(
     name = "yotta",
-    version = "0.0.12",
+    version = "0.0.13",
     author = "James Crosby",
     author_email = "James.Crosby@arm.com",
     description = ("Re-usable components for embedded software."),
     license = "Proprietary",
     keywords = "embedded package module dependency management",
     url = "about:blank",
-    packages=['yotta', os.path.join('yotta','lib')],
+    packages=find_packages(),
     long_description=read('readme.md'),
     classifiers=[
         "Development Status :: 3 - Alpha",

yotta/lib/target.py

@@ -129,12 +129,17 @@ def debug(self, builddir, program):
             return
         prog_path = os.path.join(builddir, program)
         if not os.path.isfile(prog_path):
-            suggestion = ''
-            if prog_path.endswith('.c'):
-                suggestion = prog_path[:-2]
+            suggestion = None
+            if (prog_path.endswith('.c') or prog_path.endswith('.m')) and os.path.isfile(prog_path[:-2]):
+                suggestion = program[:-2]
+            elif (prog_path.endswith('.cpp') or prog_path.endswith('.cxx')) and os.path.isfile(prog_path[:-4]):
+                suggestion = program[:-4]
+            elif os.path.isfile(os.path.join(builddir, 'source', program)):
+                suggestion = os.path.join('source', program)
+            if suggestion is not None:
+                yield "%s does not exist, perhaps you meant %s" % (program, suggestion)
             else:
-                suggestion = os.path.relpath(program), os.path.relpath(os.path.join('source', program))
-            yield "%s does not exist, perhaps you meant %s" % suggestion
+                yield "%s does not exist" % program
             return
 
 
@@ -145,21 +150,24 @@ def debug(self, builddir, program):
                 if 'debug-server' in self.description:
                     logging.debug('starting debug server...')
                     daemon = subprocess.Popen(
-                        self.description['debug-server'], cwd=builddir,
-                        stdout=dev_null, stderr=dev_null, preexec_fn=_newPGroup
+                                   self.description['debug-server'],
+                             cwd = builddir,
+                          stdout = dev_null,
+                          stderr = dev_null,
+                      preexec_fn = _newPGroup
                     )
                 else:
                     daemon = None
 
 
                 signal.signal(signal.SIGINT, _ignoreSignal);
                 cmd = [
-                    string.Template(x).safe_substitute(program=prog_path)
+                    os.path.expandvars(string.Template(x).safe_substitute(program=prog_path))
                     for x in self.description['debug']
                 ]
                 logging.debug('starting debugger: %s', cmd)
                 child = subprocess.Popen(
-                    cmd, cwd=builddir
+                    cmd, cwd = builddir
                 )
                 child.wait()
                 if child.returncode:

yotta/target.py

@@ -41,7 +41,7 @@ def execCommand(args):
             print None
     else:
         if not Target_RE.match(args.target):
-            logging.error('''Invalid target: "%s"''')#, targets must be one of:
+            logging.error('''Invalid target: "%s"''' % args.target)#, targets must be one of:
             #
             #    a valid name (lowercase letters, numbers, and hyphen)
             #    a github ref (owner/project)