Skip to content

Commit

Permalink
Merge branch 'main' into port-f767
Browse files Browse the repository at this point in the history
  • Loading branch information
networkfusion authored Sep 16, 2023
2 parents f1c6c3a + bc704dc commit a4edc8a
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 68 deletions.
59 changes: 33 additions & 26 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,54 @@
{
"name": "nanoFramework",
// Adjust this file to chose the platform you want using the prebuild containers
// Adjust this file to choose the platform you want using the prebuild containers:
// - Dockerfile.All = you can build anything but it's a very large container
// - Dockerfile.AzureRTOS = for AzureRTOS targets
// - Dockerfile.ChibiOS = for ChibiOS based targets (ex: STM32, Netduino, Orgpal)
// - Dockerfile.ESP32 = for ESP32 targets
// - Dockerfile.TI = for TI targets
// If you prefer, you can use the source files and adjust them they are located, with the same names in ./sources. This will alow you to customize them and add anything you may need on top.
// If you prefer, you can use the source files and adjust them where they are located,
// To do this, prefix 'sources'. e.g. 'sources/Dockerfile.All'.
// This will allow you to customize and build the container source and add anything you may need on top.
"dockerFile": "Dockerfile.All",
"context": ".",
"mounts": [
// Bind the Unix socket the Docker daemon listens on by default
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
// Mount .azure folder for seamless az cli auth
"source=${env:HOME}${env:USERPROFILE}/.azure,target=/home/vscode/.azure,type=bind",
// Keep command history
"source=nano-bashhistory,target=/home/vscode/commandhistory,type=volume",
// OPTIONAL: Mount .azure folder for seamless az cli auth
// "source=${env:HOME}${env:USERPROFILE}/.azure,target=/home/vscode/.azure,type=bind"
],
// Set *default* container specific settings.json values on container create.
"settings": {
"cmake.preferredGenerators": [
"Ninja"
],
"cmake.generator": "Ninja",
"cmake.autoRestartBuild" : true,
"cmake.configureSettings": {
"CMAKE_MAKE_PROGRAM":"/usr/bin/ninja"
},
"cmake.configureOnOpen": false
},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vsliveshare.vsliveshare-pack",
"streetsidesoftware.code-spell-checker",
"twxs.cmake",
"ms-vscode.cmake-tools",
"xaver.clang-format"
],
// You can pull all the repos with the latest changes, this is only valid if you are using the ./sources/Dockerfile.all containers
// Set the *default* container specific settings.json values on container create.
"customizations": {
"vscode": {
"settings": {
"cmake.preferredGenerators": [
"Ninja"
],
"cmake.generator": "Ninja",
"cmake.autoRestartBuild" : true,
"cmake.configureSettings": {
"CMAKE_MAKE_PROGRAM":"/usr/bin/ninja"
},
"cmake.configureOnOpen": false
},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vsliveshare.vsliveshare-pack",
"streetsidesoftware.code-spell-checker",
"twxs.cmake",
"ms-vscode.cmake-tools",
"xaver.clang-format"
]
}
}
// You can pull all the repos with the latest changes, this is only valid if you are using the ./sources/Dockerfile.All containers
// "postAttachCommand": "/usr/local/git-pull-repos.sh"
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "terraform --version",
// Uncomment to connect as a non-root user. See https: //aka.ms/vscode-remote/containers/non-root.
// ,"remoteUser": "vscode"
}
}
21 changes: 12 additions & 9 deletions CMake/AzureRTOS_target_os.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@

#define TARGETINFOSTRING "@CMAKE_BUILD_TYPE@ build with Azure RTOS v" STR(THREADX_MAJOR_VERSION) "." STR(THREADX_MINOR_VERSION) "." STR(THREADX_PATCH_VERSION)

#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER @TARGET_HAS_NANOBOOTER@
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#cmakedefine TARGET_SERIAL_BAUDRATE @TARGET_SERIAL_BAUDRATE@
#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER @TARGET_HAS_NANOBOOTER@
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#cmakedefine TARGET_SERIAL_BAUDRATE @TARGET_SERIAL_BAUDRATE@
#cmakedefine NANOCLR_PROFILE_NEW_CALLS @NANOCLR_PROFILE_NEW_CALLS@
#cmakedefine NANOCLR_PROFILE_NEW_ALLOCATIONS @NANOCLR_PROFILE_NEW_ALLOCATIONS@
#cmakedefine NANOCLR_TRACE_MEMORY_STATS @NANOCLR_TRACE_MEMORY_STATS@

#endif // TARGET_OS_H
19 changes: 11 additions & 8 deletions CMake/ChibiOS_target_os.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,16 @@

#define TARGETINFOSTRING "@CMAKE_BUILD_TYPE@ build with ChibiOS v" CH_VERSION "." STR(CH_VERSION_MONTH)

#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER @TARGET_HAS_NANOBOOTER@
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER @TARGET_HAS_NANOBOOTER@
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#cmakedefine NANOCLR_PROFILE_NEW_CALLS @NANOCLR_PROFILE_NEW_CALLS@
#cmakedefine NANOCLR_PROFILE_NEW_ALLOCATIONS @NANOCLR_PROFILE_NEW_ALLOCATIONS@
#cmakedefine NANOCLR_TRACE_MEMORY_STATS @NANOCLR_TRACE_MEMORY_STATS@

#endif // TARGET_OS_H
21 changes: 12 additions & 9 deletions CMake/ESP32_target_os.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,17 @@

#define IDF_VER_FIXED "@IDF_VER_FIXED@"

#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER FALSE
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#cmakedefine TARGET_SERIAL_BAUDRATE @TARGET_SERIAL_BAUDRATE@
#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER FALSE
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#cmakedefine TARGET_SERIAL_BAUDRATE @TARGET_SERIAL_BAUDRATE@
#cmakedefine NANOCLR_PROFILE_NEW_CALLS @NANOCLR_PROFILE_NEW_CALLS@
#cmakedefine NANOCLR_PROFILE_NEW_ALLOCATIONS @NANOCLR_PROFILE_NEW_ALLOCATIONS@
#cmakedefine NANOCLR_TRACE_MEMORY_STATS @NANOCLR_TRACE_MEMORY_STATS@

#endif // TARGET_OS_H
19 changes: 11 additions & 8 deletions CMake/FreeRTOS_target_os.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@

#define TARGETINFOSTRING "@CMAKE_BUILD_TYPE@ build with FREERTOS @RTOS_VERSION@"

#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER @TARGET_HAS_NANOBOOTER@
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER @TARGET_HAS_NANOBOOTER@
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#cmakedefine NANOCLR_PROFILE_NEW_CALLS @NANOCLR_PROFILE_NEW_CALLS@
#cmakedefine NANOCLR_PROFILE_NEW_ALLOCATIONS @NANOCLR_PROFILE_NEW_ALLOCATIONS@
#cmakedefine NANOCLR_TRACE_MEMORY_STATS @NANOCLR_TRACE_MEMORY_STATS@

#endif // TARGET_OS_H
18 changes: 18 additions & 0 deletions CMake/Modules/ClrProfilerOptions.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# Copyright (c) .NET Foundation and Contributors
# See LICENSE file in the project root for full license information.
#

option(NF_PROFILE_NEW_CALLS "option to support profilling new function calls" OFF)
option(NF_PROFILE_NEW_ALLOCATIONS "option to support profilling new object allocations" OFF)
option(NF_TRACE_MEMORY_STATS "option to enable trace of memory stats" OFF)

if(NF_PROFILE_NEW_CALLS)
set(NANOCLR_PROFILE_NEW_CALLS TRUE CACHE INTERNAL "option to support profilling new function calls")
endif()
if(NF_PROFILE_NEW_ALLOCATIONS)
set(NANOCLR_PROFILE_NEW_ALLOCATIONS TRUE CACHE INTERNAL "option to support profilling new object allocations")
endif()
if(NF_TRACE_MEMORY_STATS)
set(NANOCLR_TRACE_MEMORY_STATS TRUE CACHE INTERNAL "option to enable trace of memory stats")
endif()
19 changes: 11 additions & 8 deletions CMake/TI_SimpleLink_target_os.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@
#define VERSION_BUILD @nanoFramework_VERSION_PATCH@U
#define VERSION_REVISION @nanoFramework_VERSION_TWEAK@U

#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER FALSE
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#define NANOCLR_LIGHT_MATH @TARGET_LIGHT_MATH@
#define DP_FLOATINGPOINT @TARGET_DP_FLOATINGPOINT@
#define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
#define TARGET_HAS_NANOBOOTER FALSE
#define TRACE_TO_STDIO @TARGET_TRACE_TO_STDIO@
#cmakedefine NANOCLR_PROFILE_NEW_CALLS @NANOCLR_PROFILE_NEW_CALLS@
#cmakedefine NANOCLR_PROFILE_NEW_ALLOCATIONS @NANOCLR_PROFILE_NEW_ALLOCATIONS@
#cmakedefine NANOCLR_TRACE_MEMORY_STATS @NANOCLR_TRACE_MEMORY_STATS@

#endif // TARGET_OS_H
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ message(STATUS "Build directory is '${CMAKE_BINARY_DIR}'.")
message(STATUS "")
#######################

#####################################
# include CLR Profiler build options
include(ClrProfilerOptions)
#####################################

#################################################################
# ouput RTM build option
Expand Down

0 comments on commit a4edc8a

Please sign in to comment.