Merge pull request #76 from xmos/develop

Infrastructure update
xmos · Oct 29, 2019 · 818188e · 818188e
2 parents 5828043 + 10e142b
commit 818188e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 101 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Device control library change log
 =================================
 
+4.0.0
+-----
+
+  * CHANGED: Build files updated to support new "xcommon" behaviour in xwaf.
+
 3.2.4
 -----
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -101,7 +101,7 @@ pipeline {
       updateViewfiles()
     }
     cleanup {
-      cleanWs()
+      xcoreCleanSandbox()
     }
   }
 }
diff --git a/lib_device_control/LICENSE.txt b/lib_device_control/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.
 

diff --git a/lib_device_control/module_build_info b/lib_device_control/module_build_info
@@ -1,10 +1,16 @@
-VERSION = 3.2.4
+VERSION = 4.0.0
 
-DEPENDENT_MODULES = lib_xassert(>=3.0.1) lib_logging(>=2.1.1)
+DEPENDENT_MODULES = lib_xassert(>=4.0.0) \
+                    lib_logging(>=3.0.0)
 
-MODULE_XCC_FLAGS = $(XCC_FLAGS) -Os
+MODULE_XCC_FLAGS = $(XCC_FLAGS) \
+                   -Os
 
-INCLUDE_DIRS = api src
+OPTIONAL_HEADERS +=
+
+EXPORT_INCLUDE_DIRS = api
+
+INCLUDE_DIRS = $(EXPORT_INCLUDE_DIRS) \
+               src
 
-# Ignore host dir
 SOURCE_DIRS = src
diff --git a/lib_device_control/wscript b/lib_device_control/wscript