Merge pull request #208 from geky/devel_gt_client_update

Update devel_gt_client with changes on master

Author: PrzemekWirkus

.mbedignore

@@ -2,3 +2,4 @@ mbed/docs/*
 mbed/libraries/*
 mbed/travis/*
 mbed/workspace_tools/*
+tools/*

Jenkinsfile

@@ -0,0 +1,55 @@
+// List of targets to compile
+def morpheusTargets = [
+  //"LPC1768",
+  //"NUCLEO_F401RE",
+  //"NRF51822",
+  "K64F"
+  ]
+  
+// Map morpheus toolchains to compiler labels on Jenkins
+def toolchains = [
+  //ARM: "armcc",
+  GCC_ARM: "arm-none-eabi-gcc"
+  ]
+  
+// Initial maps for parallel build steps
+def stepsForParallel = [:]
+ 		 
+// Jenkins pipeline does not support map.each, we need to use oldschool for loop
+for (int i = 0; i < morpheusTargets.size(); i++) {
+  for(int j = 0; j < toolchains.size(); j++) {
+    def target = morpheusTargets.get(i)
+    def toolchain = toolchains.keySet().asList().get(j)
+    def compilerLabel = toolchains.get(toolchain)  
+    
+    def stepName = "${target} ${toolchain}"
+    stepsForParallel[stepName] = morpheusBuildStep(target, compilerLabel, toolchain)
+  }
+}
+
+/* Jenkins does not allow stages inside parallel execution, 
+ * https://issues.jenkins-ci.org/browse/JENKINS-26107 will solve this by adding labeled blocks
+ */
+stage "parallel build"
+try {
+  // Actually run the steps in parallel - parallel takes a map as an argument, hence the above.
+  parallel stepsForParallel
+  
+} catch (err) {
+  currentBuild.result = 'FAILURE'
+
+} 
+
+//Create yotta build steps for parallel execution
+ def morpheusBuildStep(target, compilerLabel, toolchain) {
+    return {
+      node ("${compilerLabel}") {
+        deleteDir()
+        dir("mbed-os") {
+          checkout scm
+          sh "mbed deploy --protocol ssh"
+          sh "mbed compile -m ${target} -t ${toolchain} -c"
+        }
+      }
+    }
+ }

circle.yml

@@ -4,8 +4,7 @@ test:
         - cd ../testproject && mbed compile -m K64F -t GCC_ARM -j 0 --source=. --source=mbed-os/TESTS/integration/basic
         - cd ../testproject && mbed compile -m K64F -t GCC_ARM -j 0 --tests
         - cd ../testproject && mbed compile -m LPC1768 -t GCC_ARM -j 0 --source=. --source=mbed-os/TESTS/integration/basic
-        - cd ../testproject && mbed compile -m NUCLEO_F401RE -t GCC_ARM -j 0 --source=. --source=mbed-os/TESTS/integration/basic
-        - cd ../testproject && mbed compile -m NRF51822 -t GCC_ARM -j 0 --source=. --source=mbed-os/TESTS/integration/basic
+        - cd ../testproject && export PYTHONPATH=$(readlink -f mbed-os) && python mbed-os/tools/test/config_test/config_test.py
 
 dependencies:
     pre:

docs/config_system.md

@@ -1 +1 @@
-https://github.com/mbedmicro/mbed/#974ecf731c8a5de78acc9e40573f2a7c7641c2cd
+https://github.com/mbedmicro/mbed/#d1ec4beabef320b48ec3cdad57e293ce7708f55f

mbed.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-client-c/#fe178dfdf9d10cd514b2c5f82a6e6eac81ca5261
+https://github.com/ARMmbed/mbed-client-c/#aebb83940c6c3b13dc81251f1668d833f113af38

net/mbed-client-c.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-client-classic/#14e9847de4d88755bf11329456094e58cb81acaa
+https://github.com/ARMmbed/mbed-client-classic/#67dbae25e0e7f8d643af7283d48dd1bb60758292

net/mbed-client-classic.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/mbed-client/#ba4f474cdfafae9a87fafab32b2b22b8102e1a5c
+https://github.com/ARMmbed/mbed-client/#43577959a229d0dc5558a9465d62b2d7b22a370f

net/mbed-client.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/nanostack-hal-mbed-cmsis-rtos/#ec78d46cb31bacae765a478beca8769ada17a01a
+https://github.com/ARMmbed/nanostack-hal-mbed-cmsis-rtos/#18b6f9f16fdcf8c846988f2d6f31bd8f5436f7f6

net/nanostack-hal-mbed-cmsis-rtos.lib

@@ -1 +1 @@
-https://github.com/ARMmbed/sal-stack-nanostack-private/#f8ce589ca32978b54734f54daa781e5637668eb7
+https://github.com/ARMmbed/sal-stack-nanostack-private/#cd18b5a50df4e12346fe5e18435a098bba1df268

net/sal-stack-nanostack-private.lib

@@ -33,7 +33,7 @@
 from tools.toolchains import TOOLCHAIN_CLASSES
 from jinja2 import FileSystemLoader
 from jinja2.environment import Environment
-
+from tools.config import Config
 
 def prep_report(report, target_name, toolchain_name, id_name):
     # Setup report keys
@@ -76,21 +76,46 @@ def add_result_to_report(report, result):
     result_wrap = { 0: result }
     report[target][toolchain][id_name].append(result_wrap)
 
+def get_config(src_path, target, toolchain_name):
+    # Convert src_path to a list if needed
+    src_paths = [src_path] if type(src_path) != ListType else src_path
+    # We need to remove all paths which are repeated to avoid
+    # multiple compilations and linking with the same objects
+    src_paths = [src_paths[0]] + list(set(src_paths[1:]))
+
+    # Create configuration object
+    config = Config(target, src_paths)
+
+    # If the 'target' argument is a string, convert it to a target instance
+    if isinstance(target, str):
+        try:
+            target = TARGET_MAP[target]
+        except KeyError:
+            raise KeyError("Target '%s' not found" % target)
+
+    # Toolchain instance
+    try:
+        toolchain = TOOLCHAIN_CLASSES[toolchain_name](target, options=None, notify=None, macros=None, silent=True, extra_verbose=False)
+    except KeyError as e:
+        raise KeyError("Toolchain %s not supported" % toolchain_name)
+
+    # Scan src_path for config files
+    resources = toolchain.scan_resources(src_paths[0])
+    for path in src_paths[1:]:
+        resources.add(toolchain.scan_resources(path))
+
+    config.add_config_files(resources.json_files)
+    return config.get_config_data()
+
 def build_project(src_path, build_path, target, toolchain_name,
         libraries_paths=None, options=None, linker_script=None,
         clean=False, notify=None, verbose=False, name=None, macros=None, inc_dirs=None,
-        jobs=1, silent=False, report=None, properties=None, project_id=None, project_description=None, extra_verbose=False):
+        jobs=1, silent=False, report=None, properties=None, project_id=None, project_description=None,
+        extra_verbose=False, config=None):
     """ This function builds project. Project can be for example one test / UT
     """
-    # Toolchain instance
-    try:
-        toolchain = TOOLCHAIN_CLASSES[toolchain_name](target, options, notify, macros, silent, extra_verbose=extra_verbose)
-    except KeyError as e:
-        raise KeyError("Toolchain %s not supported" % toolchain_name)
 
-    toolchain.VERBOSE = verbose
-    toolchain.jobs = jobs
-    toolchain.build_all = clean
+    # Convert src_path to a list if needed
     src_paths = [src_path] if type(src_path) != ListType else src_path
 
     # We need to remove all paths which are repeated to avoid
@@ -100,6 +125,26 @@ def build_project(src_path, build_path, target, toolchain_name,
     abs_path = abspath(first_src_path)
     project_name = basename(normpath(abs_path))
 
+    # If the configuration object was not yet created, create it now
+    config = config or Config(target, src_paths)
+
+    # If the 'target' argument is a string, convert it to a target instance
+    if isinstance(target, str):
+        try:
+            target = TARGET_MAP[target]
+        except KeyError:
+            raise KeyError("Target '%s' not found" % target)
+
+    # Toolchain instance
+    try:
+        toolchain = TOOLCHAIN_CLASSES[toolchain_name](target, options, notify, macros, silent, extra_verbose=extra_verbose)
+    except KeyError as e:
+        raise KeyError("Toolchain %s not supported" % toolchain_name)
+
+    toolchain.VERBOSE = verbose
+    toolchain.jobs = jobs
+    toolchain.build_all = clean
+
     if name is None:
         # We will use default project name based on project folder name
         name = project_name
@@ -148,13 +193,18 @@ def build_project(src_path, build_path, target, toolchain_name,
                 resources.inc_dirs.extend(inc_dirs)
             else:
                 resources.inc_dirs.append(inc_dirs)
+
+        # Update the configuration with any .json files found while scanning
+        config.add_config_files(resources.json_files)
+        # And add the configuration macros to the toolchain
+        toolchain.add_macros(config.get_config_data_macros())
+
         # 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
         res, needed_update = toolchain.link_program(resources, build_path, name)
 
@@ -190,7 +240,6 @@ def build_project(src_path, build_path, target, toolchain_name,
         # Let Exception propagate
         raise e
 
-
 def build_library(src_paths, build_path, target, toolchain_name,
          dependencies_paths=None, options=None, name=None, clean=False, archive=True,
          notify=None, verbose=False, macros=None, inc_dirs=None, inc_dirs_ext=None,
@@ -279,13 +328,19 @@ def build_library(src_paths, build_path, target, toolchain_name,
         else:
             tmp_path = build_path
 
+        # Handle configuration
+        config = Config(target)
+
         # Copy headers, objects and static libraries
         for resource in resources:
             toolchain.copy_files(resource.headers, build_path, rel_path=resource.base_path)
             toolchain.copy_files(resource.objects, build_path, rel_path=resource.base_path)
             toolchain.copy_files(resource.libraries, build_path, rel_path=resource.base_path)
             if resource.linker_script:
                 toolchain.copy_files(resource.linker_script, build_path, rel_path=resource.base_path)
+            config.add_config_files(resource.json_files)
+
+        toolchain.add_macros(config.get_config_data_macros())
 
         # Compile Sources
         objects = []