Added cmake variants
This commit is contained in:
parent
c0b84537b3
commit
f7643a4d82
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:18.04
|
FROM ubuntu:latest
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
RUN apt-get update -qq \
|
RUN apt-get update -qq \
|
||||||
|
@ -18,12 +18,20 @@ RUN apt-get update -qq \
|
||||||
dos2unix \
|
dos2unix \
|
||||||
clang-format \
|
clang-format \
|
||||||
clang-tidy \
|
clang-tidy \
|
||||||
|
locales \
|
||||||
|
libncurses5 \
|
||||||
# aarch64 packages
|
# aarch64 packages
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
python3-dev \
|
python3-dev \
|
||||||
rustc \
|
rustc \
|
||||||
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
|
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
|
||||||
|
|
||||||
|
#SET LOCALE
|
||||||
|
RUN locale-gen en_US.UTF-8
|
||||||
|
ENV LANG en_US.UTF-8
|
||||||
|
ENV LANGUAGE en_US:en
|
||||||
|
ENV LC_ALL en_US.UTF-8
|
||||||
|
|
||||||
RUN pip3 install adafruit-nrfutil
|
RUN pip3 install adafruit-nrfutil
|
||||||
# required for McuBoot
|
# required for McuBoot
|
||||||
|
@ -32,9 +40,10 @@ RUN pip3 install setuptools_rust
|
||||||
WORKDIR /opt/
|
WORKDIR /opt/
|
||||||
# build.sh knows how to compile but it problimatic on Win10
|
# build.sh knows how to compile but it problimatic on Win10
|
||||||
COPY build.sh .
|
COPY build.sh .
|
||||||
|
RUN chmod +x build.sh
|
||||||
# create_build_openocd.sh uses cmake to crate to build directory
|
# create_build_openocd.sh uses cmake to crate to build directory
|
||||||
COPY create_build_openocd.sh .
|
COPY create_build_openocd.sh .
|
||||||
|
RUN chmod +x create_build_openocd.sh
|
||||||
# Lets get each in a separate docker layer for better downloads
|
# Lets get each in a separate docker layer for better downloads
|
||||||
# GCC
|
# GCC
|
||||||
# RUN bash -c "source /opt/build.sh; GetGcc;"
|
# RUN bash -c "source /opt/build.sh; GetGcc;"
|
||||||
|
@ -51,4 +60,6 @@ RUN pip3 install -r ./mcuboot/scripts/requirements.txt
|
||||||
|
|
||||||
RUN adduser infinitime
|
RUN adduser infinitime
|
||||||
|
|
||||||
ENV SOURCES_DIR /workspaces/Pinetime
|
ENV NRF5_SDK_PATH /opt/nRF5_SDK_15.3.0_59ac345
|
||||||
|
ENV ARM_NONE_EABI_TOOLCHAIN_PATH /opt/gcc-arm-none-eabi-9-2020-q2-update
|
||||||
|
ENV SOURCES_DIR /workspaces/InfiniTime
|
||||||
|
|
60
.devcontainer/README.md
Normal file
60
.devcontainer/README.md
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
# VScode devcontainer
|
||||||
|
This is a docker-based interactive development environment using VSCode and Docker Devcontainers removing the need to install any tools locally*
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
- VScode
|
||||||
|
- [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension
|
||||||
|
- Docker
|
||||||
|
- OpenOCD - For debugging
|
||||||
|
|
||||||
|
## Using
|
||||||
|
|
||||||
|
### Code editing, and building.
|
||||||
|
|
||||||
|
1. Clone InifiniTime and update submodules
|
||||||
|
2. Launch VSCode
|
||||||
|
3. Open InifiTime directory,
|
||||||
|
4. Allow VSCode to open folder with devcontainer.
|
||||||
|
|
||||||
|
After this the environment will be built if you do not currently have a container setup, it will install all the necessary tools and extra VSCode extensions.
|
||||||
|
|
||||||
|
In order to build InfiniTime we need to run the initial submodule init and Cmake commands.
|
||||||
|
|
||||||
|
#### Manually
|
||||||
|
|
||||||
|
You can use the VSCode terminal to run the CMake commands as outlined in the [build instructions](blob/develop/doc/buildAndProgram.md)
|
||||||
|
|
||||||
|
#### Script
|
||||||
|
|
||||||
|
The dev enviroment comes with some scripts to make this easier, They are located in /opt/.
|
||||||
|
|
||||||
|
There are also VSCode tasks provided should you desire to use those.
|
||||||
|
|
||||||
|
The task BuildInit will update submodules and configure for openocd
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Build
|
||||||
|
|
||||||
|
You can use the build.sh script located in /opt/
|
||||||
|
|
||||||
|
There will also eventually be a Build task. - Not written yet
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Debugging
|
||||||
|
|
||||||
|
Docker on windows does not support passing USB devices to the underlying WSL2 subsystem, To get around this we use openocd in server mode running on the host.
|
||||||
|
|
||||||
|
`openocd -f <yourinterface> -f <nrf52.cfg target file>`
|
||||||
|
|
||||||
|
This will launch openocd in server mode and attach it to the MCU.
|
||||||
|
|
||||||
|
The default launch.json file expects openocd to be listening on port 3333, edit if needed
|
||||||
|
|
||||||
|
|
||||||
|
## Current Issues
|
||||||
|
Currently WSL2 Has some real performance issues with IO on a windows host. Accessing files on the virtualized filesystem is much faster. Using VSCodes "clone in container" feature of the Remote - Containers will get around this. After the container is built you will need to update the submodules and follow the build isntructions like normal
|
0
.devcontainer/build.sh
Executable file → Normal file
0
.devcontainer/build.sh
Executable file → Normal file
0
.devcontainer/create_build_openocd.sh
Executable file → Normal file
0
.devcontainer/create_build_openocd.sh
Executable file → Normal file
|
@ -19,6 +19,7 @@
|
||||||
"extensions": [
|
"extensions": [
|
||||||
"ms-vscode.cpptools",
|
"ms-vscode.cpptools",
|
||||||
"ms-vscode.cmake-tools",
|
"ms-vscode.cmake-tools",
|
||||||
|
"marus25.cortex-debug"
|
||||||
],
|
],
|
||||||
|
|
||||||
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 /workspaces/Pinetime
|
cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 ${SOURCES_DIR}
|
||||||
|
|
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
# CMake
|
# CMake
|
||||||
cmake-build-*
|
cmake-build-*
|
||||||
cmake-*
|
cmake-*/
|
||||||
CMakeFiles
|
CMakeFiles
|
||||||
**/CMakeCache.txt
|
**/CMakeCache.txt
|
||||||
cmake_install.cmake
|
cmake_install.cmake
|
||||||
|
|
15
.vscode/c_cpp_properties.json
vendored
15
.vscode/c_cpp_properties.json
vendored
|
@ -1,15 +1,18 @@
|
||||||
{
|
{
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "Linux",
|
"name": "nrfCC",
|
||||||
"includePath": [
|
"includePath": [
|
||||||
"${workspaceFolder}/**"
|
"${workspaceFolder}/**",
|
||||||
|
"${workspaceFolder}/src/**",
|
||||||
|
"${workspaceFolder}/src"
|
||||||
],
|
],
|
||||||
"defines": [],
|
"defines": [],
|
||||||
"compilerPath": "/usr/bin/gcc",
|
"compilerPath": "${env:ARM_NONE_EABI_TOOLCHAIN_PATH}/bin/arm-none-eabi-gcc",
|
||||||
"cStandard": "gnu11",
|
"cStandard": "c11",
|
||||||
"cppStandard": "gnu++14",
|
"cppStandard": "c++14",
|
||||||
"intelliSenseMode": "linux-gcc-x64",
|
"intelliSenseMode": "linux-gcc-arm",
|
||||||
|
"configurationProvider": "ms-vscode.cmake-tools",
|
||||||
"compileCommands": "${workspaceFolder}/build/compile_commands.json"
|
"compileCommands": "${workspaceFolder}/build/compile_commands.json"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
62
.vscode/cmake-variants.json
vendored
Normal file
62
.vscode/cmake-variants.json
vendored
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
{
|
||||||
|
"buildType": {
|
||||||
|
"default": "release",
|
||||||
|
"choices": {
|
||||||
|
"debug": {
|
||||||
|
"short": "Debug",
|
||||||
|
"long": "Emit debug information without performing optimizations",
|
||||||
|
"buildType": "Debug"
|
||||||
|
},
|
||||||
|
"release": {
|
||||||
|
"short": "Release",
|
||||||
|
"long": "Perform optimizations",
|
||||||
|
"buildType": "Release"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"programmer":{
|
||||||
|
"default": "OpenOCD",
|
||||||
|
"choices":{
|
||||||
|
"OpenOCD":{
|
||||||
|
"short":"OpenOCD",
|
||||||
|
"long": "Use OpenOCD",
|
||||||
|
"settings":{
|
||||||
|
"USE_OPENOCD":1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"JLink":{
|
||||||
|
"short":"JLink",
|
||||||
|
"long": "Use JLink",
|
||||||
|
"settings":{
|
||||||
|
"USE_JLINK":1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"GDB":{
|
||||||
|
"short":"GDB",
|
||||||
|
"long": "Use GDB",
|
||||||
|
"settings":{
|
||||||
|
"USE_GDB_CLIENT":1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"DFU": {
|
||||||
|
"default": "no",
|
||||||
|
"choices": {
|
||||||
|
"no": {
|
||||||
|
"short": "No DFU",
|
||||||
|
"long": "Do not build DFU",
|
||||||
|
"settings": {
|
||||||
|
"BUILD_DFU":0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"yes": {
|
||||||
|
"short": "Build DFU",
|
||||||
|
"long": "Build DFU",
|
||||||
|
"settings": {
|
||||||
|
"BUILD_DFU":1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
46
.vscode/launch.json
vendored
Normal file
46
.vscode/launch.json
vendored
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
{
|
||||||
|
"version": "0.1.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "Debug - Openocd docker Remote",
|
||||||
|
"type":"cortex-debug",
|
||||||
|
"cortex-debug.armToolchainPath":"${env:COMPILER_DIR}/bin",
|
||||||
|
"cwd": "${workspaceRoot}",
|
||||||
|
"executable": "${command:cmake.launchTargetPath}",
|
||||||
|
"request": "launch",
|
||||||
|
"servertype": "external",
|
||||||
|
// This may need to be arm-none-eabi-gdb depending on your system
|
||||||
|
"gdbPath" : "${env:COMPILER_DIR}/bin/arm-none-eabi-gdb",
|
||||||
|
// Connect to an already running OpenOCD instance
|
||||||
|
"gdbTarget": "host.docker.internal:3333",
|
||||||
|
"svdFile": "${workspaceRoot}/nrf52.svd",
|
||||||
|
"runToMain": true,
|
||||||
|
// Work around for stopping at main on restart
|
||||||
|
"postRestartCommands": [
|
||||||
|
"break main",
|
||||||
|
"continue"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Debug - Openocd Local",
|
||||||
|
"type":"cortex-debug",
|
||||||
|
"cortex-debug.armToolchainPath":"${env:COMPILER_DIR}/bin",
|
||||||
|
"cwd": "${workspaceRoot}",
|
||||||
|
"executable": "${command:cmake.launchTargetPath}",
|
||||||
|
"request": "launch",
|
||||||
|
"servertype": "openocd",
|
||||||
|
// This may need to be arm-none-eabi-gdb depending on your system
|
||||||
|
"gdbPath" : "${env:COMPILER_DIR}/bin/arm-none-eabi-gdb",
|
||||||
|
// Connect to an already running OpenOCD instance
|
||||||
|
"gdbTarget": "localhost:3333",
|
||||||
|
"svdFile": "${workspaceRoot}/nrf52.svd",
|
||||||
|
"runToMain": true,
|
||||||
|
// Work around for stopping at main on restart
|
||||||
|
"postRestartCommands": [
|
||||||
|
"break main",
|
||||||
|
"continue"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
]
|
||||||
|
}
|
65
.vscode/settings.json
vendored
65
.vscode/settings.json
vendored
|
@ -1,59 +1,8 @@
|
||||||
{
|
{
|
||||||
"files.associations": {
|
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
|
||||||
"chrono": "cpp",
|
"cmake.configureArgs": [
|
||||||
"list": "cpp",
|
"-DARM_NONE_EABI_TOOLCHAIN_PATH=${env:ARM_NONE_EABI_TOOLCHAIN_PATH}",
|
||||||
"array": "cpp",
|
"-DNRF5_SDK_PATH=${env:NRF5_SDK_PATH}",
|
||||||
"atomic": "cpp",
|
],
|
||||||
"bit": "cpp",
|
"cmake.generator": "Unix Makefiles"
|
||||||
"*.tcc": "cpp",
|
}
|
||||||
"cctype": "cpp",
|
|
||||||
"charconv": "cpp",
|
|
||||||
"clocale": "cpp",
|
|
||||||
"cmath": "cpp",
|
|
||||||
"condition_variable": "cpp",
|
|
||||||
"cstdarg": "cpp",
|
|
||||||
"cstddef": "cpp",
|
|
||||||
"cstdint": "cpp",
|
|
||||||
"cstdio": "cpp",
|
|
||||||
"cstdlib": "cpp",
|
|
||||||
"cstring": "cpp",
|
|
||||||
"ctime": "cpp",
|
|
||||||
"cwchar": "cpp",
|
|
||||||
"cwctype": "cpp",
|
|
||||||
"deque": "cpp",
|
|
||||||
"unordered_map": "cpp",
|
|
||||||
"vector": "cpp",
|
|
||||||
"exception": "cpp",
|
|
||||||
"algorithm": "cpp",
|
|
||||||
"functional": "cpp",
|
|
||||||
"iterator": "cpp",
|
|
||||||
"memory": "cpp",
|
|
||||||
"memory_resource": "cpp",
|
|
||||||
"netfwd": "cpp",
|
|
||||||
"numeric": "cpp",
|
|
||||||
"optional": "cpp",
|
|
||||||
"random": "cpp",
|
|
||||||
"ratio": "cpp",
|
|
||||||
"string": "cpp",
|
|
||||||
"string_view": "cpp",
|
|
||||||
"system_error": "cpp",
|
|
||||||
"tuple": "cpp",
|
|
||||||
"type_traits": "cpp",
|
|
||||||
"utility": "cpp",
|
|
||||||
"fstream": "cpp",
|
|
||||||
"initializer_list": "cpp",
|
|
||||||
"iosfwd": "cpp",
|
|
||||||
"iostream": "cpp",
|
|
||||||
"istream": "cpp",
|
|
||||||
"limits": "cpp",
|
|
||||||
"mutex": "cpp",
|
|
||||||
"new": "cpp",
|
|
||||||
"ostream": "cpp",
|
|
||||||
"sstream": "cpp",
|
|
||||||
"stdexcept": "cpp",
|
|
||||||
"streambuf": "cpp",
|
|
||||||
"thread": "cpp",
|
|
||||||
"cinttypes": "cpp",
|
|
||||||
"typeinfo": "cpp"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
44
.vscode/tasks.json
vendored
Normal file
44
.vscode/tasks.json
vendored
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"label": "create openocd build",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "/opt/create_build_openocd.sh",
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
},
|
||||||
|
"presentation": {
|
||||||
|
"reveal": "always",
|
||||||
|
"panel": "shared"
|
||||||
|
},
|
||||||
|
"problemMatcher": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "update submodules",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "git submodule update --init",
|
||||||
|
"options": {
|
||||||
|
"cwd": "${workspaceFolder}"
|
||||||
|
},
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
},
|
||||||
|
"presentation": {
|
||||||
|
"reveal": "always",
|
||||||
|
"panel": "shared"
|
||||||
|
},
|
||||||
|
"problemMatcher": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "BuildInit",
|
||||||
|
"dependsOn": [
|
||||||
|
"update submodules",
|
||||||
|
"create openocd build"
|
||||||
|
],
|
||||||
|
"problemMatcher": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
Loading…
Reference in a new issue