Merge pull request #76 from xmos/develop

chrisc-xmos · web-flow · commit 818188ef663f · 2019-10-29T16:01:57.000Z
Infrastructure update
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

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ pipeline {`
`101`	`101`	`updateViewfiles()`
`102`	`102`	`}`
`103`	`103`	`cleanup {`
`104`		`- cleanWs()`
	`104`	`+ xcoreCleanSandbox()`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`