Diff: build.py

Revision:

9:2d27d77ada5c

Parent:

0:66f3b5499f7f

Child:

13:ab47a20b66f0

diff -r a8ac6ed29081 -r 2d27d77ada5c build.py
--- a/build.py	Tue Jun 07 11:35:02 2016 +0100
+++ b/build.py	Tue Jun 14 11:07:30 2016 +0100
@@ -116,17 +116,17 @@
                       default=False,
                       help="Displays supported matrix of MCUs and toolchains")
 
+    parser.add_option('-f', '--filter',
+                      dest='general_filter_regex',
+                      default=None,
+                      help='For some commands you can use filter to filter out results')
+
     parser.add_option("", "--cppcheck",
                       action="store_true",
                       dest="cppcheck_validation",
                       default=False,
                       help="Forces 'cppcheck' static code analysis")
 
-    parser.add_option('-f', '--filter',
-                      dest='general_filter_regex',
-                      default=None,
-                      help='For some commands you can use filter to filter out results')
-
     parser.add_option("-j", "--jobs", type="int", dest="jobs",
                       default=0, help="Number of concurrent jobs. Default: 0/auto (based on host machine's number of CPUs)")
 
@@ -192,7 +192,7 @@
     if options.usb_host:
         libraries.append("usb_host")
     if options.dsp:
-        libraries.extend(["cmsis_dsp", "dsp"])
+        libraries.extend(["dsp"])
     if options.fat:
         libraries.extend(["fat"])
     if options.ublox:
@@ -233,7 +233,8 @@
                 tt_id = "%s::%s" % (toolchain, target)
                 try:
                     mcu = TARGET_MAP[target]
-                    lib_build_res = build_library(options.source_dir, options.build_dir, mcu, toolchain,
+                    if options.source_dir:
+                        lib_build_res = build_library(options.source_dir, options.build_dir, mcu, toolchain,
                                                     options=options.options,
                                                     extra_verbose=options.extra_verbose_notify,
                                                     verbose=options.verbose,
@@ -242,6 +243,16 @@
                                                     clean=options.clean,
                                                     archive=(not options.no_archive),
                                                     macros=options.macros)
+                    else:
+                        lib_build_res = build_mbed_libs(mcu, toolchain,
+                                                    options=options.options,
+                                                    extra_verbose=options.extra_verbose_notify,
+                                                    verbose=options.verbose,
+                                                    silent=options.silent,
+                                                    jobs=options.jobs,
+                                                    clean=options.clean,
+                                                    macros=options.macros)
+
                     for lib_id in libraries:
                         build_lib(lib_id, mcu, toolchain,
                                   options=options.options,