[nRF Connect] Add tasks to VS Code Container (#3717)

* [nRF Connect] Add tasks to VS Code Container * Bump Docker version
project-chip · Jan 12, 2021 · 9102577 · 9102577
1 parent 1e9d208
commit 9102577
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 2 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -54,3 +54,5 @@ RUN echo "PATH=/home/$USERNAME/bin:${PATH}" >> /home/$USERNAME/.bashrc
 # $USERNAME needs to own the esp-idf and tools for the examples to build
 RUN chown -R $USERNAME:$USERNAME /opt/espressif/esp-idf
 RUN chown -R $USERNAME:$USERNAME /opt/espressif/tools
+# $USERNAME needs to own west configuration to build nRF Connect examples
+RUN chown -R $USERNAME:$USERNAME /opt/NordicSemiconductor/nrfconnect/.west
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -71,6 +71,17 @@
                 "path": ["${workspaceFolder}/out/debug/"],
                 "limitSymbolsToIncludedHeaders": true
             }
+        },
+        {
+            "name": "nRF Connect examples debug (GN)",
+            "cStandard": "c11",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "gcc-arm",
+            "compilerPath": "/opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major/bin/arm-none-eabi-gcc",
+            "browse": {
+                "path": ["${workspaceFolder}/out/debug/"],
+                "limitSymbolsToIncludedHeaders": true
+            }
         }
     ],
     "version": 4

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -140,6 +140,58 @@
             "command": "TARGET_CPU=arm64 scripts/examples/android_app.sh",
             "group": "build",
             "problemMatcher": ["$gcc"]
+        },
+        {
+            "label": "Build nRF Connect Lock Example",
+            "type": "shell",
+            "command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh lock-app",
+            "group": "build",
+            "problemMatcher": {
+                "base": "$gcc",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceFolder}/examples/lock-app/nrfconnect/build"
+                ]
+            }
+        },
+        {
+            "label": "Build nRF Connect Lighting Example",
+            "type": "shell",
+            "command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh lighting-app",
+            "group": "build",
+            "problemMatcher": {
+                "base": "$gcc",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceFolder}/examples/lighting-app/nrfconnect/build"
+                ]
+            }
+        },
+        {
+            "label": "Build nRF Connect Shell Example",
+            "type": "shell",
+            "command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh shell",
+            "group": "build",
+            "problemMatcher": {
+                "base": "$gcc",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceFolder}/examples/shell/nrfconnect/build"
+                ]
+            }
+        },
+        {
+            "label": "Build nRF Connect Pigweed Example",
+            "type": "shell",
+            "command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh pigweed-app",
+            "group": "build",
+            "problemMatcher": {
+                "base": "$gcc",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceFolder}/examples/pigweed-app/nrfconnect/build"
+                ]
+            }
         }
     ]
 }
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -9,6 +9,7 @@ COPY --from=esp32 /opt/espressif/tools /opt/espressif/tools
 COPY --from=esp32 /opt/espressif/qemu /opt/espressif/qemu
 COPY --from=nrf /opt/NordicSemiconductor/nRF5_tools /opt/NordicSemiconductor/nRF5_tools
 COPY --from=nrf /opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major /opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major
+COPY --from=nrf /opt/nrfconnect/sdk-nrf /opt/NordicSemiconductor/nrfconnect
 COPY --from=efr32 /opt/SiliconLabs/sdk_support /opt/SiliconLabs/sdk_support
 COPY --from=android /opt/android/sdk /opt/android/sdk
 COPY --from=android /opt/android/android-ndk-r21b /opt/android/android-ndk-r21b
@@ -17,6 +18,9 @@ ENV IDF_TOOLS_PATH=/opt/espressif/tools
 ENV QEMU_ESP32_DIR=/opt/espressif/qemu
 ENV QEMU_ESP32=/opt/espressif/qemu/xtensa-softmmu/qemu-system-xtensa
 ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
+ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
+ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
+ENV GNUARMEMB_TOOLCHAIN_PATH=/opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major
 ENV ARM_GCC_INSTALL_ROOT=/opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major/bin
 ENV EFR32_SDK_ROOT=/opt/SiliconLabs/sdk_support
 ENV EFR32_BOARD=BRD4161A

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.4.16
+0.4.17
diff --git a/scripts/helpers/clean.sh b/scripts/helpers/clean.sh
@@ -18,4 +18,4 @@
 
 set -ex
 
-rm -rf out/
+rm -rf out/ examples/*/nrfconnect/build/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,4 @@

		set -ex

		rm -rf out/
		rm -rf out/ examples/*/nrfconnect/build/