Merge pull request #38 from shuchitak/feature/xwaf-xcommon

chrisc-xmos · web-flow · commit ffbd5d9ccde9 · 2019-09-13T10:49:41.000+01:00
Feature/xwaf xcommon
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 lib_src change log
 ==================
 
+2.0.0
+-----
+
+  * CHANGED: Build files updated to support new "xcommon" behaviour in xwaf.
+
 1.1.2
 -----
 
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
       updateViewfiles()
     }
     cleanup {
-      cleanWs()
+      xcoreCleanSandbox()
     }
   }
 }
diff --git a/lib_src/module_build_info b/lib_src/module_build_info
@@ -1,5 +1,31 @@
+VERSION = 2.0.0
+
+DEPENDENT_MODULES = lib_logging(>=3.0.0) \
+                    lib_xassert(>=4.0.0)
+
+MODULE_XCC_FLAGS = $(XCC_FLAGS) \
+                   -Wno-missing-braces \
+                   -O3
+
 OPTIONAL_HEADERS += src_conf.h
 
-MODULE_XCC_FLAGS = $(XCC_FLAGS) -Wno-missing-braces -O3
-DEPENDENT_MODULES = lib_logging(>=2.1.1) lib_xassert(>=3.0.1)
-VERSION = 1.1.2
+EXPORT_INCLUDE_DIRS = api \
+                      src/fixed_factor_of_3 \
+                      src/fixed_factor_of_3/ds3 \
+                      src/fixed_factor_of_3/os3 \
+                      src/fixed_factor_of_3_voice \
+                      src/multirate_hifi \
+                      src/multirate_hifi/asrc \
+                      src/multirate_hifi/ssrc
+
+INCLUDE_DIRS = $(EXPORT_INCLUDE_DIRS)
+
+SOURCE_DIRS = src/fixed_factor_of_3 \
+              src/fixed_factor_of_3/ds3 \
+              src/fixed_factor_of_3/os3 \
+              src/fixed_factor_of_3_voice \
+              src/fixed_factor_of_3_voice/ds3_voice \
+              src/fixed_factor_of_3_voice/us3_voice \
+              src/multirate_hifi \
+              src/multirate_hifi/asrc \
+              src/multirate_hifi/ssrc
diff --git a/lib_src/wscript b/lib_src/wscript

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ pipeline {`
`80`	`80`	`updateViewfiles()`
`81`	`81`	`}`
`82`	`82`	`cleanup {`
`83`		`- cleanWs()`
	`83`	`+ xcoreCleanSandbox()`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`