Extract System.Collections from mscorlib

- Update CMakes to remove files from mscorlib. - Add build option to expose new API. - Update templates accordingly. - Add CMake and source files to support new API. - Update CLR CMake to accomodate required changes. - Update target templates to surface the new build option as a compiler define. - Update build options for all targets to include System.Collections. Signed-off-by: José Simões <jose.simoes@eclo.solutions>
nanoframework · Nov 4, 2019 · 08e747d · 08e747d
1 parent b0a4758
commit 08e747d
Show file tree

Hide file tree

Showing 19 changed files with 347 additions and 256 deletions.
diff --git a/CMake/ChibiOS_target_os.h.in b/CMake/ChibiOS_target_os.h.in
@@ -27,4 +27,6 @@
 
 #define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
 
+#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
+
 #endif /* _TARGET_OS_H_ */
diff --git a/CMake/ESP32_target_os.h.in b/CMake/ESP32_target_os.h.in
@@ -24,4 +24,6 @@
 
 #define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
 
+#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
+
 #endif /* _TARGET_OS_H_ */
diff --git a/CMake/Modules/FindNF_CoreCLR.cmake b/CMake/Modules/FindNF_CoreCLR.cmake
@@ -40,9 +40,7 @@ set(NF_CoreCLR_SRCS
     CLR_RT_HeapBlock_Finalizer.cpp
     CLR_RT_HeapBlock_Lock.cpp
     CLR_RT_HeapBlock_LockRequest.cpp
-    CLR_RT_HeapBlock_Queue.cpp
     CLR_RT_HeapBlock_Node.cpp
-    CLR_RT_HeapBlock_Stack.cpp
     CLR_RT_HeapBlock_String.cpp
     CLR_RT_HeapBlock_Timer.cpp
     CLR_RT_HeapBlock_WaitForObject.cpp
@@ -79,8 +77,6 @@ set(NF_CoreCLR_SRCS
     corlib_native_System_Attribute.cpp
     corlib_native_System_BitConverter.cpp
     corlib_native_System_Collections_ArrayList.cpp
-    corlib_native_System_Collections_Queue.cpp
-    corlib_native_System_Collections_Stack.cpp
     corlib_native_System_Console.cpp
     corlib_native_System_Convert.cpp
     corlib_native_System_DateTime.cpp
@@ -179,6 +175,12 @@ if(NF_FEATURE_SUPPORT_REFLECTION)
     list(APPEND NF_CoreCLR_SRCS corlib_native_System_Type.cpp)
 endif()
 
+# include Collection support files depending on build option
+if(API_nanoFramework.System.Collections)
+    list(APPEND NF_CoreCLR_SRCS CLR_RT_HeapBlock_Queue.cpp)
+    list(APPEND NF_CoreCLR_SRCS CLR_RT_HeapBlock_Stack.cpp)
+endif()
+
 # need a conditional include because of ESP32 building network as a library 
 if(NOT USE_SECURITY_MBEDTLS_OPTION)
     list(APPEND NF_CoreCLR_SRCS base64.c)

diff --git a/CMake/Modules/FindnanoFramework.System.Collections.cmake b/CMake/Modules/FindnanoFramework.System.Collections.cmake
@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2019 The nanoFramework project contributors
+# See LICENSE file in the project root for full license information.
+#
+
+
+# set include directories
+list(APPEND nanoFramework.System.Collections_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/HAL/Include")
+list(APPEND nanoFramework.System.Collections_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/nanoFramework.System.Collections")
+
+
+# the following CLR support files are required and added to the build by FindNF_CoreCLR.cmake
+# CLR_RT_HeapBlock_Queue.cpp
+# CLR_RT_HeapBlock_Stack.cpp
+
+# source files
+set(nanoFramework.System.Collections_SRCS
+
+    # source files of the assembly
+    nf_system_collections_System_Collections_Queue.cpp
+    nf_system_collections_System_Collections_Stack.cpp
+    nf_system_collections.cpp
+)
+
+foreach(SRC_FILE ${nanoFramework.System.Collections_SRCS})
+    set(nanoFramework.System.Collections_SRC_FILE SRC_FILE-NOTFOUND)
+    find_file(nanoFramework.System.Collections_SRC_FILE ${SRC_FILE}
+        PATHS
+
+            # path for source files of this module
+            ${PROJECT_SOURCE_DIR}/src/nanoFramework.System.Collections
+
+        CMAKE_FIND_ROOT_PATH_BOTH
+    )
+    # message("${SRC_FILE} >> ${nanoFramework.System.Collections_SRC_FILE}") # debug helper
+    list(APPEND nanoFramework.System.Collections_SOURCES ${nanoFramework.System.Collections_SRC_FILE})
+endforeach()
+
+
+include(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(nanoFramework.System.Collections DEFAULT_MSG nanoFramework.System.Collections_INCLUDE_DIRS nanoFramework.System.Collections_SOURCES)
diff --git a/CMake/Modules/NF_NativeAssemblies.cmake b/CMake/Modules/NF_NativeAssemblies.cmake
@@ -14,6 +14,7 @@ option(API_nanoFramework.Devices.OneWire        "option for nanoFramework.Device
 option(API_nanoFramework.Networking.Sntp        "option for nanoFramework.Networking.Sntp")
 option(API_nanoFramework.Runtime.Events         "option for nanoFramework.Runtime.Events API")
 option(API_nanoFramework.ResourceManager        "option for nanoFramework.ResourceManager")
+option(API_nanoFramework.System.Collections     "option for nanoFramework.System.Collections")
 option(API_System.Math                          "option for System.Math")
 option(API_System.Net                           "option for System.Net")
 option(API_Windows.Devices.Adc                  "option for Windows.Devices.Adc API")
@@ -111,6 +112,12 @@ macro(ParseNativeAssemblies)
         PerformSettingsForApiEntry("nanoFramework.ResourceManager")
     endif()
 
+    # nanoFramework.System.Collections
+    if(API_nanoFramework.System.Collections)
+        ##### API name here (doted name)
+        PerformSettingsForApiEntry("nanoFramework.System.Collections")
+    endif()
+
     # nanoFramework.Runtime.Events
     if(API_nanoFramework.Runtime.Events)
         ##### API name here (doted name)

diff --git a/CMake/TI_SimpleLink_target_os.h.in b/CMake/TI_SimpleLink_target_os.h.in
@@ -24,4 +24,6 @@
 
 #define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@
 
+#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@
+
 #endif /* _TARGET_OS_H_ */
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -430,6 +430,22 @@ endif()
 
 #################################################################
 
+#################################################################
+
+#############################################
+# handles inclusion of System.Collections API
+#############################################
+
+if(API_nanoFramework.System.Collections)
+    set(TARGET_SYSTEM_COLLECTIONS TRUE CACHE INTERNAL "enable support for System.Collections API")
+    message(STATUS "Support for System.Collections API enabled")
+else()
+    set(TARGET_SYSTEM_COLLECTIONS FALSE CACHE INTERNAL "DISABLE support for System.Collections API")
+    message(STATUS "Support for System.Collections API **IS NOT** enabled")
+endif()
+
+#################################################################
+
 #################################################################
 # manage HAL/PAL required for API namespaces
 #################################################################

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -130,17 +130,17 @@ jobs:
     matrix:
       MBN_QUAIL:
         BoardName: MBN_QUAIL
-        BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.ResourceManager=ON
+        BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
         GccArm_Version:
         NeedsDFU: true
       NETDUINO3_WIFI:
         BoardName: NETDUINO3_WIFI
-        BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Devices.Dac=OFF -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_Windows.Storage=ON -DAPI_nanoFramework.ResourceManager=ON
+        BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Devices.Dac=OFF -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_Windows.Storage=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
         GccArm_Version:
         NeedsDFU: true
       ST_STM32F429I_DISCOVERY:
         BoardName: ST_STM32F429I_DISCOVERY
-        BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.Devices.Can=ON -DAPI_nanoFramework.ResourceManager=ON
+        BuildOptions: -DTARGET_SERIES=STM32F4xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.Devices.Can=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
         GccArm_Version:
         NeedsDFU: false
       ST_NUCLEO64_F091RC:
@@ -150,7 +150,7 @@ jobs:
         NeedsDFU: false
       ST_STM32F769I_DISCOVERY:
         BoardName: ST_STM32F769I_DISCOVERY
-        BuildOptions: -DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Devices.Dac=ON -DAPI_System.Net=ON -DNF_SECURITY_MBEDTLS=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.Devices.Can=ON -DAPI_Windows.Storage=ON -DAPI_nanoFramework.ResourceManager=ON
+        BuildOptions: -DTARGET_SERIES=STM32F7xx -DRTOS=CHIBIOS -DSUPPORT_ANY_BASE_CONVERSION=ON -DNF_FEATURE_DEBUGGER=ON -DSWO_OUTPUT=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Hardware.Stm32=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Devices.Dac=ON -DAPI_System.Net=ON -DNF_SECURITY_MBEDTLS=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.Devices.Can=ON -DAPI_Windows.Storage=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
         GccArm_Version:
         NeedsDFU: false 
 
@@ -191,7 +191,7 @@ jobs:
     matrix:
       ESP32_WROOM_32:
         BoardName: ESP32_WROOM_32
-        BuildOptions: -DTARGET_SERIES=ESP32 -DRTOS=FREERTOS_ESP32 -DNF_WP_IMPLEMENTS_CRC32=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Net=ON -DAPI_Windows.Devices.Wifi=ON -DAPI_Windows.Storage=ON -DNF_SECURITY_MBEDTLS=ON -DAPI_Hardware.Esp32=ON -DSUPPORT_ANY_BASE_CONVERSION=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.ResourceManager=ON
+        BuildOptions: -DTARGET_SERIES=ESP32 -DRTOS=FREERTOS_ESP32 -DNF_WP_IMPLEMENTS_CRC32=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DNF_FEATURE_HAS_SDCARD=ON -DAPI_System.Math=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=ON -DAPI_Windows.Devices.Adc=ON -DAPI_System.Net=ON -DAPI_Windows.Devices.Wifi=ON -DAPI_Windows.Storage=ON -DNF_SECURITY_MBEDTLS=ON -DAPI_Hardware.Esp32=ON -DSUPPORT_ANY_BASE_CONVERSION=ON -DAPI_nanoFramework.Devices.OneWire=ON -DAPI_nanoFramework.ResourceManager=ON -DAPI_nanoFramework.System.Collections=ON
 
   variables:
     ESP32_TOOLCHAIN_PATH: $(Agent.TempDirectory)\ESP32_Tools
@@ -234,7 +234,7 @@ jobs:
     matrix:
       TI_CC3220SF_LAUNCHXL:
         BoardName: TI_CC3220SF_LAUNCHXL
-        BuildOptions: -DTARGET_SERIES=CC32xx -DRTOS=TI_SIMPLELINK -DSUPPORT_ANY_BASE_CONVERSION=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_WATCHDOG=OFF -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=OFF -DAPI_Windows.Devices.Adc=ON -DAPI_System.Net=ON
+        BuildOptions: -DTARGET_SERIES=CC32xx -DRTOS=TI_SIMPLELINK -DSUPPORT_ANY_BASE_CONVERSION=OFF -DNF_FEATURE_DEBUGGER=ON -DNF_FEATURE_RTC=ON -DNF_FEATURE_WATCHDOG=OFF -DNF_FEATURE_HAS_CONFIG_BLOCK=ON -DAPI_Windows.Devices.Gpio=ON -DAPI_Windows.Devices.Spi=ON -DAPI_Windows.Devices.I2c=ON -DAPI_Windows.Devices.Pwm=ON -DAPI_Windows.Devices.SerialCommunication=OFF -DAPI_Windows.Devices.Adc=ON -DAPI_System.Net=ON -DAPI_nanoFramework.System.Collections=ON
         GccArm_Version:
 
   variables:

diff --git a/cmake-variants.TEMPLATE-ESP32.json b/cmake-variants.TEMPLATE-ESP32.json
@@ -58,6 +58,7 @@
             "API_System.Net": "ON",
             "NF_SECURITY_MBEDTLS": "ON",
             "API_nanoFramework.ResourceManager" : "ON",
+            "API_nanoFramework.System.Collections" : "ON",
             "API_Windows.Devices.Wifi": "ON",
             "API_Windows.Devices.Adc": "ON",
             "API_System.Devices.Dac" : "OFF",

diff --git a/cmake-variants.TEMPLATE.json b/cmake-variants.TEMPLATE.json
@@ -71,6 +71,7 @@
           "API_nanoFramework.Devices.Can" : "OFF-default-ON-to-add-this-API",
           "API_nanoFramework.Devices.OneWire" : "OFF-default-ON-to-add-this-API",
           "API_nanoFramework.ResourceManager" : "OFF-default-ON-to-add-this-API",
+          "API_nanoFramework.System.Collections" : "OFF-default-ON-to-add-this-API",
           "API_System.Math" : "OFF-default-ON-to-add-this-API",
           "API_System.Net" : "OFF-default-ON-to-add-this-API",
           "API_Windows.Devices.Adc" : "OFF-default-ON-to-add-this-API",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,6 @@

		#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@

		#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@

		#endif /* _TARGET_OS_H_ */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,6 @@

		#define NANOCLR_REFLECTION @TARGET_NANOCLR_REFLECTION@

		#define NANOCLR_SYSTEM_COLLECTIONS @TARGET_SYSTEM_COLLECTIONS@

		#endif /* _TARGET_OS_H_ */