Propagate "clean" option for library builds

Keep the server program cycle target dependent
Keep program compilation and linking separate
Compile separately sources from different directory roots

Author: emilmont

workspace_tools/build.py

@@ -86,10 +86,10 @@
             try:
                 mcu = TARGET_MAP[target]
                 build_mbed_libs(mcu, toolchain, options=options.options,
-                                verbose=options.verbose)
+                                verbose=options.verbose, clean=options.clean)
                 for lib_id in libraries:
                     build_lib(lib_id, mcu, toolchain, options=options.options,
-                              verbose=options.verbose)
+                              verbose=options.verbose, clean=options.clean)
                 successes.append(id)
             except Exception, e:
                 if options.verbose:

workspace_tools/build_api.py

@@ -3,7 +3,7 @@
 from types import ListType
 
 from workspace_tools.utils import mkdir
-from workspace_tools.toolchains import TOOLCHAIN_CLASSES, Resources
+from workspace_tools.toolchains import TOOLCHAIN_CLASSES
 from workspace_tools.paths import MBED_TARGETS_PATH, MBED_LIBRARIES, MBED_API, MBED_HAL, MBED_COMMON
 from workspace_tools.libraries import Library
 
@@ -22,7 +22,9 @@ def build_project(src_path, build_path, target, toolchain_name,
 
     # Scan src_path and libraries_paths for resources
     resources = toolchain.scan_resources(src_path)
+    src_paths = [src_path]
     if libraries_paths is not None:
+        src_paths.extend(libraries_paths)
         for path in libraries_paths:
             resources.add(toolchain.scan_resources(path))
 
@@ -35,8 +37,14 @@ def build_project(src_path, build_path, target, toolchain_name,
             rmtree(build_path)
     mkdir(build_path)
 
-    # Build Program
-    return toolchain.build_program(resources, build_path, name)
+    # Compile Sources
+    for path in src_paths:
+        src = toolchain.scan_resources(path)
+        objects = toolchain.compile_sources(src, build_path, resources.inc_dirs)
+        resources.objects.extend(objects)
+    
+    # Link Program
+    return toolchain.link_program(resources, build_path, name)
 
 
 """
@@ -73,10 +81,11 @@ def build_library(src_paths, build_path, target, toolchain_name,
         resources.append(toolchain.scan_resources(src_path))
 
     # Dependencies Include Paths
-    dependencies = Resources()
+    dependencies_include_dir = []
     if dependencies_paths is not None:
         for path in dependencies_paths:
-            dependencies.add(toolchain.scan_resources(path))
+            lib_resources = toolchain.scan_resources(path)
+            dependencies_include_dir.extend(lib_resources.inc_dirs)
 
     # Create the desired build directory structure
     bin_path = join(build_path, toolchain.obj_path)
@@ -91,21 +100,23 @@ def build_library(src_paths, build_path, target, toolchain_name,
     # Compile Sources
     objects = []
     for resource in resources:
-        objects.extend(toolchain.compile_sources(resource, tmp_path, dependencies.inc_dirs))
+        objects.extend(toolchain.compile_sources(resource, tmp_path, dependencies_include_dir))
 
     toolchain.build_library(objects, bin_path, name)
 
 
-def build_lib(lib_id, target, toolchain, options=None, verbose=False):
+def build_lib(lib_id, target, toolchain, options=None, verbose=False, clean=False):
     lib = Library(lib_id)
     if lib.is_supported(target, toolchain):
-        build_library(lib.source_dir, lib.build_dir, target, toolchain, lib.dependencies, options, verbose=verbose)
+        build_library(lib.source_dir, lib.build_dir, target, toolchain,
+                      lib.dependencies, options,
+                      verbose=verbose, clean=clean)
     else:
         print '\n\nLibrary "%s" is not yet supported on target %s with toolchain %s' % (lib_id, target.name, toolchain)
 
 
 # We do have unique legacy conventions about how we build and package the mbed library
-def build_mbed_libs(target, toolchain_name, options=None, verbose=False):
+def build_mbed_libs(target, toolchain_name, options=None, verbose=False, clean=False):
     # Check toolchain support
     if toolchain_name not in target.supported_toolchains:
         print '\n%s target is not yet supported by toolchain %s' % (target.name, toolchain_name)
@@ -114,6 +125,7 @@ def build_mbed_libs(target, toolchain_name, options=None, verbose=False):
     # Toolchain
     toolchain = TOOLCHAIN_CLASSES[toolchain_name](target, options)
     toolchain.VERBOSE = verbose
+    toolchain.build_all = clean
 
     # Source and Build Paths
     BUILD_TARGET = join(MBED_LIBRARIES, "TARGET_" + target.name)

workspace_tools/server.py

@@ -16,6 +16,7 @@
 from workspace_tools.utils import delete_dir_files
 from workspace_tools.settings import * 
 from workspace_tools.tests import *
+from workspace_tools.targets import TARGET_MAP
 
 
 class ProcessObserver(Thread):
@@ -127,6 +128,7 @@ def handle(self):
 
         disk = mut['disk']
         port = mut['port']
+        target = TARGET_MAP[mut['mcu']]
 
         # Program
         # When the build and test system were separate, this was relative to a
@@ -145,7 +147,7 @@ def handle(self):
             for f in test.extra_files:
                 copy(f, disk)
 
-        sleep(1)
+        sleep(target.program_cycle_s)
 
         # Host test
         self.request.setblocking(0)

workspace_tools/toolchains/__init__.py

@@ -349,15 +349,13 @@ def build_library(self, objects, dir, name):
             self.info("Library: %s" % lib)
             self.archive(objects, fout)
 
-    def build_program(self, r, tmp_path, name):
-        objects = self.compile_sources(r, tmp_path) + r.objects
-        
+    def link_program(self, r, tmp_path, name):
         elf = join(tmp_path, name + '.elf')
         bin = join(tmp_path, name + '.bin')
 
-        if self.need_update(elf, objects + r.libraries + [r.linker_script]):
+        if self.need_update(elf, r.objects + r.libraries + [r.linker_script]):
             self.progress("link", name)
-            self.link(elf, objects, r.libraries, r.lib_dirs, r.linker_script)
+            self.link(elf, r.objects, r.libraries, r.lib_dirs, r.linker_script)
 
         if self.need_update(bin, [elf]):
             self.progress("elf2bin", name)