Merge pull request #9 from xmos/develop

chrisc-xmos · web-flow · commit 04e9ce8cf69f · 2019-10-28T16:48:00.000Z
Develop
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 lib_xassert change log
 ======================
 
+4.0.0
+-----
+
+  * CHANGED: Build files updated to support new "xcommon" behaviour in xwaf.
+
 3.0.1
 -----
 
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -57,7 +57,7 @@ pipeline {
       updateViewfiles()
     }
     cleanup {
-      cleanWs()
+      xcoreCleanSandbox()
     }
   }
 }
diff --git a/lib_xassert/LICENSE.txt b/lib_xassert/LICENSE.txt
@@ -1,6 +1,6 @@
 Software Release License Agreement
 
-Copyright (c) 2014-2017, XMOS, All rights reserved.
+Copyright (c) 2014-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_xassert/module_build_info b/lib_xassert/module_build_info
@@ -1,3 +1,14 @@
-OPTIONAL_HEADERS += debug_conf.h xassert_conf.h
+VERSION = 4.0.0
 
-VERSION = 3.0.1
+DEPENDENT_MODULES =
+
+MODULE_XCC_FLAGS = $(XCC_FLAGS)
+
+OPTIONAL_HEADERS += debug_conf.h \
+                    xassert_conf.h
+
+EXPORT_INCLUDE_DIRS = api
+
+INCLUDE_DIRS = $(EXPORT_INCLUDE_DIRS)
+
+SOURCE_DIRS = src
diff --git a/lib_xassert/wscript b/lib_xassert/wscript
