Sync infrastructure updates from develop

.gitignore

@@ -30,6 +30,7 @@ tests/test_results.csv
 *.fir_coefs
 examples/AN00221_freq_domain_example/doc/pdf/AN00218.pdf
 examples/AN00218_app_hires_DAS_fixed/doc/pdf/AN00218.pdf
+**/.venv/**
 
 # waf build files
 .lock-waf_*

Brewfile

@@ -0,0 +1,7 @@
+tap 'homebrew/core'
+
+brew 'perl'
+brew 'cpanm'
+
+brew 'python@2'
+brew 'pipenv'

CHANGELOG.rst

@@ -1,11 +1,19 @@
 lib_mic_array change log
 ========================
 
-3.1.1
+3.2.0
 -----
 
+  * Added xwaf build system support
   * Cleaned up some of the code in the FIR designer.
   * Removed fixed gain in examples
+  * Update VU meter example
+  * Fix port types in examples
+  * Set and inherit XCC_FLAGS rather than XCC_XC_FLAGS when building library
+
+3.1.1
+-----
+
   * Updated lib_dsp dependancy from 3.0.0 to 4.0.0
 
 3.1.0

Jenkinsfile

@@ -1,20 +1,56 @@
-@Library('xmos_jenkins_shared_library@master') _
+@Library('xmos_jenkins_shared_library@develop') _
+
 getApproval()
+
 pipeline {
   agent {
-    label 'x86&&macOS&&Apps'
+    label 'x86_64&&brew'
   }
   environment {
-    VIEW = 'mic_array'
     REPO = 'lib_mic_array'
+    VIEW = "${env.JOB_NAME.contains('PR-') ? REPO+'_'+env.CHANGE_TARGET : REPO+'_'+env.BRANCH_NAME}"
+  }
+  triggers {
+    /* Trigger this Pipeline on changes to the repos dependencies
+     *
+     * If this Pipeline is running in a pull request, the triggers are set
+     * on the base branch the PR is set to merge in to.
+     *
+     * Otherwise the triggers are set on the branch of a matching name to the
+     * one this Pipeline is on.
+     */
+    upstream(
+      upstreamProjects:
+        (env.JOB_NAME.contains('PR-') ?
+          "../lib_dsp/${env.CHANGE_TARGET}," +
+          "../lib_i2c/${env.CHANGE_TARGET}," +
+          "../lib_i2s/${env.CHANGE_TARGET}," +
+          "../lib_logging/${env.CHANGE_TARGET}," +
+          "../lib_mic_array_board_support/${env.CHANGE_TARGET}," +
+          "../lib_xassert/${env.CHANGE_TARGET}," +
+          "../tools_released/${env.CHANGE_TARGET}," +
+          "../tools_xmostest/${env.CHANGE_TARGET}," +
+          "../xdoc_released/${env.CHANGE_TARGET}"
+        :
+          "../lib_dsp/${env.BRANCH_NAME}," +
+          "../lib_i2c/${env.BRANCH_NAME}," +
+          "../lib_i2s/${env.BRANCH_NAME}," +
+          "../lib_logging/${env.BRANCH_NAME}," +
+          "../lib_mic_array_board_support/${env.BRANCH_NAME}," +
+          "../lib_xassert/${env.BRANCH_NAME}," +
+          "../tools_released/${env.BRANCH_NAME}," +
+          "../tools_xmostest/${env.BRANCH_NAME}," +
+          "../xdoc_released/${env.BRANCH_NAME}"),
+      threshold: hudson.model.Result.SUCCESS
+    )
   }
   options {
     skipDefaultCheckout()
   }
   stages {
     stage('Get View') {
       steps {
-        prepareAppsSandbox("${VIEW}", "${REPO}")
+        xcorePrepareSandbox("${VIEW}", "${REPO}")
       }
     }
     stage('Library Checks') {

Pipfile

@@ -0,0 +1,7 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+flake8 = "*"

cpanfile

@@ -0,0 +1,2 @@
+requires 'File::Copy::Recursive';
+requires 'LWP::Simple'

lib_mic_array/module_build_info

@@ -1,7 +1,7 @@
-MODULE_XCC_XC_FLAGS = $(XCC_XC_FLAGS)
+MODULE_XCC_FLAGS = $(XCC_FLAGS)
 
 INCLUDE_DIRS = api src/fir
 
 DEPENDENT_MODULES = lib_xassert(>=3.0.0) lib_logging(>=2.1.0) lib_dsp(>=4.0.0)
 
-VERSION = 3.1.1
+VERSION = 3.2.0

lib_mic_array/wscript

@@ -86,7 +86,7 @@ def read_module_build_info(bld):
 def use_module(bld):
     module_build_info = read_module_build_info(bld)
     sources = bld.path.ant_glob(['src/**/*.xc', 'src/**/*.S'])
-    bld.env.MODULE_XCC_XC_FLAGS = module_build_info['MODULE_XCC_XC_FLAGS']
+    bld.env.MODULE_XCC_FLAGS = module_build_info['MODULE_XCC_FLAGS']
     bld.module(
         source=sources,
         includes=module_build_info['INCLUDE_DIRS'],