Merge pull request #1 from openweave/master

Updating fork from openweave-core

Author: g-coppock

.default-version

@@ -1 +1 @@
-4.1.0
+4.1.2

.travis.yml

@@ -1,5 +1,5 @@
 #
-#    Copyright 2018 Google LLC. All Rights Reserved.
+#    Copyright 2018-2019 Google LLC. All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -43,18 +43,10 @@ matrix:
       env: BUILD_TARGET="linux-auto-gcc-lint" CC="gcc"
       os: linux
       compiler: gcc
-    - name: "Linux with Defaults against GCC Functional and Unit Tests"
-      env: BUILD_TARGET="linux-auto-gcc-check" CC="gcc"
-      os: linux
-      compiler: gcc
     - name: "Linux with Defaults against clang/LLVM"
       env: BUILD_TARGET="linux-auto-clang" CC="clang"
       os: linux
       compiler: clang
-    - name: "Linux with LwIP against GCC Functional and Unit Tests"
-      env: BUILD_TARGET="linux-lwip-gcc-check" CC="gcc"
-      os: linux
-      compiler: gcc
     - name: "Linux with LWIP against clang/LLVM"
       env: BUILD_TARGET="linux-lwip-clang" CC="clang"
       os: linux
@@ -67,11 +59,43 @@ matrix:
       env: BUILD_TARGET="osx-lwip-clang" CC="clang"
       os: osx
       compiler: clang
-    - name: "Linux with Defaults against GCC Network and Service (Happy) Tests"
+    - name: "ESP32 (openweave-esp32-demo)"
+      env: BUILD_TARGET="esp32"
+    - name: "Linux with Defaults against GCC Functional and Unit Tests"
+      env: BUILD_TARGET="linux-auto-gcc-check" CC="gcc"
       os: linux
       compiler: gcc
-      env: BUILD_TARGET="linux-auto-gcc-check-happy"
-    - name: "ESP32"
-      env: BUILD_TARGET="esp32"
+    - name: "Linux with LwIP against GCC Functional and Unit Tests"
+      env: BUILD_TARGET="linux-lwip-gcc-check" CC="gcc"
+      os: linux
+      compiler: gcc
+    - name: "Linux with Defaults against GCC Network and Service Tests"
+      os: linux
+      compiler: gcc
+      env: BUILD_TARGET="linux-auto-gcc-check-happy" TRAVIS_TAG="true"
+    - name: "Linux with LwIP against GCC Network and Service Tests"
+      os: linux
+      compiler: gcc
+      env: BUILD_TARGET="linux-lwip-gcc-check-happy" TRAVIS_TAG="true"
 
+#
+#   deploy description:
+#      Travis CI supports uploading to Google Cloud Storage (GCS).
+#      openweave gcs bucket location: happy-test-log/<build_number> under link: https://storage.cloud.google.com/openweave"
+#      tags: true: deployment is triggered if and only if $TRAVIS_TAG is set here.
+#      Travis-CI help link: https://docs.travis-ci.com/user/deployment/gcs/
+#
 
+deploy:
+  provider: gcs
+  access_key_id: GOOGNPZYTVTEPZM5VBRAVVUU
+  secret_access_key:
+    secure: HH/3FOuU8M4AG9Gdwjs52yw2L1JnAvupcLbFurJtrfqfspXYj/1JKTbGjbmVcb6jS/mK9pNPCs2q/L111JeufWa5cR8RAw49CZ9ENqUHs0t7FV0vgk2h7O+QrQVDCQqN9XvgTGpe071IFJOPCpASRYTT1NT6wqEFyPyCl6b+eU8RLXkRwSQrd2heAdKlD/sHBda3AA9OE8AnKRdY5ZKLhtAt2xl9z4w6vWi1MTbmoRVZaCZaAjmtM5OmRAbqTz4kO41Zy57u1350uEiuOV6l/1QVpfd8zk3iYMC4T5OGrDVzk53WejnHa+Ne1nanswW6HBnsrunBcJV3KWSx2O3mdKBsBunJ4t+gjYAtYaPdMIqqvswXXN95d6VOayTvFBJfmcPLNz4h4ypDf9wYBrSdCpnHWTJh8lmgC2vd8k2tvy/67OgVlYUUX5X+cOkLZI4cfVwOrx2wFIYvxcbsh1LyUQ/EE97QOuftcgnI654u/VLJXuPK9lTj3tEDlH27Hz7h8aJ/dpsOTTCC4t0AqAiXaU7S4HO7B3WnQf4ObVzUCcIQLeqHAlzg+BcOCgy+Jvrqrq4A1PB10YAdwIWjBtIZ2fEuuCCFNCcE9rMp5ddnc3sVVX+NEfDm+O9HeNRvg2VRTWq4Bm5sBSjzJ+SDP5bK9BQrSoXwiqDRM+AGheB1B1w=
+  bucket: openweave
+  skip_cleanup: true
+  acl: public-read
+  upload-dir: happy-test-log/$TRAVIS_BUILD_NUMBER
+  local-dir: "$TRAVIS_BUILD_DIR/happy-test-logs"
+  on:
+    repo: openweave/openweave-core
+    tags: true

.travis/before_install.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-#    Copyright 2018 Google LLC All Rights Reserved.
+#    Copyright 2018-2019 Google LLC All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -22,6 +22,14 @@
 #      integration 'before_install' trigger of the 'install' step.
 #
 
+NORDIC_SDK_FOR_THREAD_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5-SDK-for-Thread/nRF5-SDK-for-Thread-and-Zigbee/nRF5SDKforThreadandZigbee20029775ac.zip
+
+NORDIC_COMMAND_LINE_TOOLS_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF5-command-line-tools/sw/nRF-Command-Line-Tools_9_8_1_Linux-x86_64.tar
+
+ARM_GCC_TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
+
+TMPDIR=${TMPDIR-/tmp}
+
 die()
 {
     echo " *** ERROR: " ${*}
@@ -61,12 +69,45 @@ installdeps()
             # OpenWeave Core may use OpenSSL for cryptography. The
             # OpenSSL version included in package depends on the
             # perl Text::Template mmodule.
-
             curl -L https://cpanmin.us | sudo perl - --sudo App::cpanminus
             sudo cpanm "Text::Template"
 
             ;;
 
+        nrf5-sdk)
+            # Install Nordic nRF52840 SDK for Thread and Zigbee
+            wget -O ${TMPDIR}/nordic_sdk_for_thread.zip -nv ${NORDIC_SDK_FOR_THREAD_URL} || exit 1
+            unzip -d ${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee -q ${TMPDIR}/nordic_sdk_for_thread.zip || exit 1
+            rm ${TMPDIR}/nordic_sdk_for_thread.zip
+            
+            ;;
+        
+        nrf5-tools)
+            # Install Nordic nRF5x Command Line Tools
+            wget -O ${TMPDIR}/nordic_command_line_tools.tar -nv ${NORDIC_COMMAND_LINE_TOOLS_URL} || exit 1
+            mkdir ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools
+            tar -C ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools -xf ${TMPDIR}/nordic_command_line_tools.tar || exit 1
+            rm ${TMPDIR}/nordic_command_line_tools.tar
+
+            ;;
+
+        arm-gcc)
+            # Install ARM GCC Toolchain
+            wget -O ${TMPDIR}/arm_gcc_toolchain.tar.bz2 -nv ${ARM_GCC_TOOLCHAIN_URL} || exit 1
+            mkdir ${TRAVIS_BUILD_DIR}/arm
+            tar -jxf ${TMPDIR}/arm_gcc_toolchain.tar.bz2 --directory ${TRAVIS_BUILD_DIR}/arm || exit 1
+            rm ${TMPDIR}/arm_gcc_toolchain.tar.bz2
+
+            ;;
+
+        osx-autotools)
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install automake libtool
+            ;;
+            
+        osx-openssl)
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install openssl
+            ;;
+        
     esac
 }
 
@@ -94,16 +135,17 @@ case "${BUILD_TARGET}" in
 
         ;;
 
-    osx-auto-clang|osx-lwip-clang)
-        # By default, OpenWeave Core uses OpenSSL for cryptography on
-        # OS X and the OpenSSL version included in package depends
-        # on the perl Text::Template mmodule.
-        
-        installdeps "openssl-deps"
+    nrf52840)
+        .travis/prepare_nrf52840.sh
 
         ;;
 
-    linux-auto-gcc-check-happy)
+    osx-*)
+        installdeps "osx-autotools"
+        installdeps "osx-openssl"
+        ;;
+
+    linux-auto-gcc-check-happy|linux-lwip-gcc-check-happy)
         # By default, the BLE layer is enabled in OpenWeave Core and,
         # by default on Linux, the BLE layer is implemented by
         # BlueZ. Satisfy its dependencies.
@@ -120,15 +162,9 @@ case "${BUILD_TARGET}" in
 
         cd $HOME
         git clone https://github.com/openweave/happy.git
-
-        mkdir -p ve
-        cd ve
-        virtualenv happy
-        ls ./happy/bin/activate
-        . ./happy/bin/activate
         cd ${HOME}/happy
+        make install
         python pip_packages.py
-        python setup.py develop
         pip install pexpect
         sudo apt install python-gobject
         sudo apt install python-dbus

.travis/build_nrf52840.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+#
+#    Copyright 2019 Google LLC All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+#
+#    Description:
+#      Travis CI build script for nRF52840 integration builds.
+#
+
+# Export NRF5_SDK_ROOT variable pointing to the nRF5x SDK for Thread and Zigbee.
+export NRF5_SDK_ROOT=${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee
+
+# Export NRF5_TOOLS_ROOT variable pointing to the nRF5x command line tools.
+export NRF5_TOOLS_ROOT=${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools
+
+# Export GNU_INSTALL_ROOT variable pointing to the ARM GCC tool chain.
+export GNU_INSTALL_ROOT=${TRAVIS_BUILD_DIR}/arm/gcc-arm-none-eabi-7-2018-q2-update/bin/
+
+# Export GNU_VERSION variable.
+export GNU_VERSION=7.3.1
+
+# Add Nordic nRF jprog tool to the path.
+export PATH=${PATH}:${NRF5_TOOLS_ROOT}/nrfjprog
+
+# Set OPENWEAVE_ROOT to the Travis build directory. This will result in the example app being
+# built using the target OpenWeave commit.
+export OPENWEAVE_ROOT=${TRAVIS_BUILD_DIR}
+
+# Build the example application.
+make -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example || exit 1

.travis/github_deploy_key.enc

@@ -21,9 +21,12 @@
 #      Travis CI build preparation script for the ESP32 target on Linux.
 #
 
+TMPDIR=${TMPDIR-/tmp}
+
+# Set tools download links
+#
 XTENSA_TOOL_CHAIN_URL=https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
 ESP_IDF_VERSION=v3.0.4
-TMPDIR=${TMPDIR-/tmp}
 
 # --------------------------------------------------------------------------------
 
@@ -62,6 +65,7 @@ fi
 if git -C ${TRAVIS_BUILD_DIR}/openweave-esp32-demo rev-parse --verify origin/${SOURCE_BRANCH} >/dev/null 2>&1; then
     git -C ${TRAVIS_BUILD_DIR}/openweave-esp32-demo checkout ${SOURCE_BRANCH}
 fi
+DEMO_APP_BRANCH=`git -C ${TRAVIS_BUILD_DIR}/openweave-esp32-demo rev-parse --abbrev-ref HEAD`
 
 # Initialize and update all submodules within the demo app EXCEPT the
 # OpenWeave submodule.
@@ -85,7 +89,7 @@ echo '--------------------------------------------------------------------------
 echo 'ESP32 Build Preparation Complete'
 echo ''
 echo "openweave-core branch: ${TRAVIS_BRANCH}"
-echo 'openweave-esp32-demo branch: '`git -C ${TRAVIS_BUILD_DIR}/openweave-esp32-demo rev-parse --abbrev-ref HEAD`
+echo "openweave-esp32-demo branch: ${DEMO_APP_BRANCH}"
 echo "ESP-IDF version: ${ESP_IDF_VERSION}"
 echo "Xtensa Tool Chain: ${XTENSA_TOOL_CHAIN_URL}"
 echo 'Commit Hashes'

.travis/prepare_esp32.sh

@@ -0,0 +1,97 @@
+#!/bin/sh
+
+#
+#    Copyright 2019 Google LLC All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+#
+#    Description:
+#      Travis CI build preparation script for the nRF52840 target on Linux.
+#
+
+TMPDIR=${TMPDIR-/tmp}
+
+# Set tools download links
+#
+NORDIC_SDK_FOR_THREAD_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5-SDK-for-Thread/nRF5-SDK-for-Thread-and-Zigbee/nRF5SDKforThreadandZigbeev300d310e71.zip
+NORDIC_COMMAND_LINE_TOOLS_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF5-command-line-tools/sw/nRF-Command-Line-Tools_9_8_1_Linux-x86_64.tar
+ARM_GCC_TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
+
+# --------------------------------------------------------------------------------
+
+set -x
+
+# Install Nordic nRF52840 SDK for Thread and Zigbee
+#
+wget -O ${TMPDIR}/nordic_sdk_for_thread.zip -nv ${NORDIC_SDK_FOR_THREAD_URL} || exit 1
+unzip -d ${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee -q ${TMPDIR}/nordic_sdk_for_thread.zip || exit 1
+rm ${TMPDIR}/nordic_sdk_for_thread.zip
+
+# Install Nordic nRF5x Command Line Tools
+#
+wget -O ${TMPDIR}/nordic_command_line_tools.tar -nv ${NORDIC_COMMAND_LINE_TOOLS_URL} || exit 1
+mkdir ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools
+tar -C ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools -xf ${TMPDIR}/nordic_command_line_tools.tar || exit 1
+rm ${TMPDIR}/nordic_command_line_tools.tar
+
+# Install ARM GCC Toolchain
+#
+wget -O ${TMPDIR}/arm_gcc_toolchain.tar.bz2 -nv ${ARM_GCC_TOOLCHAIN_URL} || exit 1
+mkdir ${TRAVIS_BUILD_DIR}/arm
+tar -jxf ${TMPDIR}/arm_gcc_toolchain.tar.bz2 --directory ${TRAVIS_BUILD_DIR}/arm || exit 1
+rm ${TMPDIR}/arm_gcc_toolchain.tar.bz2
+
+# Clone the openweave-nrf52840-lock-example application.  This code will be used to
+# test the ability to build OpenWeave for the nRF52840.
+#
+git -C ${TRAVIS_BUILD_DIR} clone https://github.com/openweave/openweave-nrf52840-lock-example.git || exit 1
+
+# Test if a parallel branch exists in the example repo with the same name
+# as the OpenWeave branch being built.  If so, build using that branch of
+# the example app.
+#
+SOURCE_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}
+if [ -z "${SOURCE_BRANCH}" ]; then
+    SOURCE_BRANCH=${TRAVIS_BRANCH}
+fi
+if git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example rev-parse --verify origin/${SOURCE_BRANCH} >/dev/null 2>&1; then
+    git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example checkout ${SOURCE_BRANCH}
+fi
+EXAMPLE_APP_BRANCH=`git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example rev-parse --abbrev-ref HEAD`
+
+# Initialize and update all submodules within the example app EXCEPT the
+# OpenWeave submodule.
+#
+git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example submodule init || exit 1
+git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example submodule deinit third_party/openweave-core || exit 1
+git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example submodule update || exit 1
+
+set +x
+
+# Log relevant build information.
+#
+echo '---------------------------------------------------------------------------'
+echo 'nRF52840 Build Preparation Complete'
+echo ''
+echo "openweave-core branch: ${TRAVIS_BRANCH}"
+echo "openweave-nrf52840-lock-example branch: ${EXAMPLE_APP_BRANCH}"
+echo "Nordic SDK for Thread and Zigbee: ${NORDIC_SDK_FOR_THREAD_URL}"
+echo "Nordic nRF5x Command Line Tools: ${NORDIC_COMMAND_LINE_TOOLS_URL}"
+echo "ARM GCC Toolchain: ${ARM_GCC_TOOLCHAIN_URL}"
+echo 'Commit Hashes'
+echo '  openweave-core: '`git -C ${TRAVIS_BUILD_DIR} rev-parse --short HEAD`
+echo '  openweave-nrf52840-lock-example: '`git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example rev-parse --short HEAD`
+git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example submodule --quiet foreach 'echo "  openweave-nrf52840-lock-example/$path: "`git rev-parse --short HEAD`'
+echo '---------------------------------------------------------------------------'