Merge pull request #23 from xmos/develop

Develop

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Logging change log
 ==================
 
+3.0.0
+-----
+
+  * CHANGED: Build files updated to support new "xcommon" behaviour in xwaf.
+
 2.1.1
 -----
 

Jenkinsfile

@@ -68,7 +68,7 @@ pipeline {
       updateViewfiles()
     }
     cleanup {
-      cleanWs()
+      xcoreCleanSandbox()
     }
   }
 }

examples/AN00239/LICENSE.txt

@@ -1,6 +1,6 @@
 Software Release License Agreement
 
-Copyright (c) 2016-2018, XMOS, All rights reserved.
+Copyright (c) 2016-2019, XMOS, All rights reserved.
 
 BY ACCESSING, USING, INSTALLING OR DOWNLOADING THE XMOS SOFTWARE, YOU AGREE TO BE BOUND BY THE FOLLOWING TERMS. IF YOU DO NOT AGREE TO THESE, DO NOT ATTEMPT TO DOWNLOAD, ACCESS OR USE THE XMOS Software.
 

examples/AN00239/wscript

@@ -1,13 +1,14 @@
-def configure(conf):
-    conf.load('xwaf.compiler_xcc')
+def options(opt):
+    opt.load('xwaf.xcommon')
 
+def configure(conf):
+    conf.load('xwaf.xcommon')
 
 def build(bld):
-    bld.env.TARGET_ARCH = 'XCORE-200-EXPLORER'
-    bld.env.XCC_FLAGS = ['-g', '-report', '-Os', '-DDEBUG_PRINT_ENABLE=1']
-    bld.XSCOPE = 'src/config.xscope'
-
-    # Build our program
-    prog = bld.program(
-        source=['src/main.xc', 'src/unit.xc'],
-        depends_on='lib_logging(>=2.1.0)')
+    bld.do_xcommon()
+
+def dist(ctx):
+    ctx.load('xwaf.xcommon')
+
+def distcheck(ctx):
+    ctx.load('xwaf.xcommon')

examples/app_debug_printf/wscript

@@ -1,12 +1,14 @@
-def configure(conf):
-    conf.load('xwaf.compiler_xcc')
+def options(opt):
+    opt.load('xwaf.xcommon')
 
+def configure(conf):
+    conf.load('xwaf.xcommon')
 
 def build(bld):
-    bld.env.TARGET_ARCH = 'SLICEKIT-L16'
-    bld.env.XCC_FLAGS = ['-DDEBUG_PRINT_ENABLE=1']
+    bld.do_xcommon()
+
+def dist(ctx):
+    ctx.load('xwaf.xcommon')
 
-    # Build our program
-    prog = bld.program(
-        source='src/main.xc',
-        depends_on='lib_logging')
+def distcheck(ctx):
+    ctx.load('xwaf.xcommon')

lib_logging/module_build_info

@@ -1,7 +1,14 @@
+VERSION = 3.0.0
+
+DEPENDENT_MODULES =
+
+MODULE_XCC_FLAGS = $(XCC_FLAGS) \
+                   -Os
+
 OPTIONAL_HEADERS += debug_conf.h
 
-INCLUDE_DIRS = api
+EXPORT_INCLUDE_DIRS = api
 
-MODULE_XCC_FLAGS = $(XCC_FLAGS) -Os
+INCLUDE_DIRS = $(EXPORT_INCLUDE_DIRS)
 
-VERSION = 2.1.1
+SOURCE_DIRS = src

tests/debug_printf_test/LICENSE.txt

@@ -1,6 +1,6 @@
 Software Release License Agreement
 
-Copyright (c) 2015-2017, XMOS, All rights reserved.
+Copyright (c) 2015-2019, XMOS, All rights reserved.
 
 BY ACCESSING, USING, INSTALLING OR DOWNLOADING THE XMOS SOFTWARE, YOU AGREE TO BE BOUND BY THE FOLLOWING TERMS. IF YOU DO NOT AGREE TO THESE, DO NOT ATTEMPT TO DOWNLOAD, ACCESS OR USE THE XMOS Software.
 

tests/debug_printf_test/wscript

@@ -1,12 +1,14 @@
-def configure(conf):
-    conf.load('xwaf.compiler_xcc')
+def options(opt):
+    opt.load('xwaf.xcommon')
 
+def configure(conf):
+    conf.load('xwaf.xcommon')
 
 def build(bld):
-    bld.env.TARGET_ARCH = 'SLICEKIT-L16'
-    bld.env.XCC_FLAGS = ['-DDEBUG_PRINT_ENABLE=1']
+    bld.do_xcommon()
+
+def dist(ctx):
+    ctx.load('xwaf.xcommon')
 
-    # Build our program
-    prog = bld.program(
-        source='src/main.xc',
-        depends_on='lib_logging')
+def distcheck(ctx):
+    ctx.load('xwaf.xcommon')