Skip to content

Refactor build system #2017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 48 commits into from
Aug 24, 2021
Merged

Refactor build system #2017

merged 48 commits into from
Aug 24, 2021

Conversation

josesimoes
Copy link
Member

@josesimoes josesimoes commented Aug 24, 2021 •
edited
Loading

Description

  • Major refactor of the build system.
  • Remove duplicated (or similar) CMake script or blocks.
  • Reuse macros.
  • Refactor macros to do a better use of arguments.
  • CoreCLR, native assemblies, network, debugger and wire protocol are now build as libraries.
  • Rework guard macros on all headers to follow gcc guidance on how to use.
  • Remove unused folders.

Motivation and Context

  • Clean-up the build system.
  • Have the various reusable components building as libraries to ease usage and fine tune build options.
  • Pave way for building ESP32 images with IDF 4.x.

How Has This Been Tested?

Screenshots

Types of changes

  • Improvement (non-breaking change that improves a feature, code or algorithm)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Config and build (change in the configuration and build system, has no impact on code or features)
  • Dependencies (update dependencies and changes associated, has no impact on code or features)
  • Unit Tests (work on Unit Tests, has no impact on code or features)
  • Documentation (changes or updates in the documentation, has no impact on code or features)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@josesimoes
Fix target_compile_definitions
87304bd 
- Remove unnecessary quotes.
- Move to common location on platforms where it makes sense to do so.
@josesimoes
Configure file target_os is now placed in a good known location
3a565f0 
- Adjusts config file call.
- Adjust path.
- Add destination path to includes.
@josesimoes
Rename include directory to use correct case
57034cc 
- Update include accordingly.
@josesimoes
Configure file target_board is now placed in a good known location
cb06a76 
- Adjusts config file call.
- Adjust path.
- Add destination path to includes.
@josesimoes
Configure file target_common is now placed in a good known location
b78eef9 
 - Adjusts config file call.
- Adjust path.
- Add destination path to includes.
@josesimoes
Fix target_board generation for TI CC3220SF
f7c6dc7
@josesimoes
Fixed destination location for some template generated files
1709322
@josesimoes
Rename of TI-SimpleLink
1c5da2e 
- Folder to replace with underscored name.
- Rename paths.
- Renames on docs.
@josesimoes
Rename RTOS in main CMake to match case
a1c448d
@josesimoes
Fix mirroring of HAL_USE_RTC_OPTION to NXP HAL
1cca734
@josesimoes
Network components now build as a library
6b318c0 
- Rename NF_Networking to NF_Network.
- Rework NF_Network module to search files in known locations.
- Add nf_add_lib_network macro to allow CMakes to add network library to their builds.
- Move inclusion of platform source code files to network module.
- Remove inclusion of network related packages from common bin utils.
- Add missing include for mbedTLS and NXP sources.
- Rework NF_ADD_PLATFORM_PACKAGES and NF_ADD_PLATFORM_DEPENDENCIES to properly add and reference NF_Network library.
- Adjust network capable targets CMakes to use these changes.
@josesimoes
Global rename of macros and functions
312b220 
- Rename macros and functions to lower case, same for their arguments. Following CMake style guide.
- Move functions in build utils module to binutils.common.
- Remove adding this package.
- Move macros in NF_Utils binutils.common.
- Add include where needed.
@josesimoes
Add missing include for ChibiOS network build
9c00e71 
- Remove helper output.
@josesimoes
Rework nanoHALCore module to be a library
7e9e757 
- Rename to NF_HALCore.
- Rework CMake to make it work.
- Rework platform CMakes to add this.
@josesimoes
Add common dependencies macro
2d21d75 
- Add call to this macro from all platform dependencies macro.
@josesimoes
Fix build for ESP32
10b6d09
@josesimoes
Adjust block storage size release build of ST_NUCLEO64_F091RC
967febb
@josesimoes
Fix define check
2871a2e
@josesimoes
Rework nf_set_compiler_definitions
77d7cbc 
- Changed from function to macro.
- Moved common definitions (on all platforms) to nf_common_compiler_definitions.
- Add parsing and validation of args.
- Rename macro for coherence.
- Update and rework callers where needed.
@josesimoes
Rename nf_set_compile_options for coherence
436828e 
- Rework CMakes accordingly.
@josesimoes
Rework CoreCLR to become a library
a1476a1 
- Add macro to setup library build.
- Update CMakes accordingly.
- Fix config and checks for UART1 on TI SimpleLink.
- Fix adding compile definitions and options on all libs to allow building for ESP32.
*** WIP for ESP32 build: can't use it as library because of the serious deviation from other targets build system***
@josesimoes
Refactor nf_set_linker_options
ff5838b 
- It's now a macro.
- Add parameters to process target and optionally link map file and extra link flags.
- Rework caller CMakes accordingly.
@josesimoes
Fix NF_HALCore build
ae48e81 
- Remove settings for source files.
- Remove unnecessary add of compile definitions (now added through nf_set_compile_definitions).
@josesimoes
Refactor nf_set_link_map
ef2b78f 
- This is now a common macro.
- Remove call to it from nf_set_linker_options.
- Add call to to targets CMakes.
- Remove extraneous argument from libray builds.
@josesimoes
Fix build on some targets
42e5450 
- Add missing stubs or source files that weren't being added to the "main" target just to the libaries.
@josesimoes
Add nf_include_libraries_in_build macro
0cb3e56 
- This macro adds libraries to the linker call.
- Rework options modules to call it.
@josesimoes
HALCore doesn't build as a library anymore
ddf7d9f 
- Remove macro and update CMakes accordingly.
@josesimoes
Fix compiler error with duplicated names
8c5ea31
@josesimoes
Several fixes in CMakes
db59f47 
- Remove commented lines.
- Adjust adding files required for both booter and CLR.
- Add linker options for libraries based on build options.
- Remove wrong inclusions of libs in ESP32 CMake.
@josesimoes
Move language definition to main CMake
d4b8d87
@josesimoes
Improve check of build options
5228528 
- Now RTOS has to be defined, ChibiOS is not the default anymore.
- Tweak output messages.
@josesimoes
Improve vars and globals cleaning
430a142
@josesimoes
Fix inclusion of gcc library
5fa25b2
@josesimoes
Fix include dirs for ChibiOS build
92c5bcb
@josesimoes
Fix managed heap size of ST_NUCLEO64_F091RC
27c81d0
@josesimoes
Add nf_setup_target_build
e00b2c8
@josesimoes
Miscellaneous build fixes
047c367 
- Remove duplicated and unnecessary entries.
- Remove duplicate generation of target_platform.h files.
@josesimoes
Native assemblies are now added to the build as a library
9cee633 
- Update CMakes accordingly. (except ESP32 has it doesn't like the change).
@josesimoes
Fix ChibiOS build
c110bc9
@josesimoes
Fix NF_Assemblies build for TI SimpleLink
893b6ed 
- Rework sys config targets to have the files generated and copied in the correct order.
- Fix nf_add_platform_packages macro to match other platforms.
@josesimoes
Rework nf_set_compile_options
57ccd92 
- Is now a macro.
- Add arguments with target and extra compile options.
@josesimoes
Rework all macros to use individual prefix
f2904f0 
- Required to solve issues caused by overwriting variables between macros.
@josesimoes
Refactor all targets to use new macro nf_setup_target_build
556662e 
- Building a target is now much simpler with less parameters and configurations required.
- Add empty CMake files to NXP to satisfy build system.
@josesimoes
Fix inclusion of NF_HALCore
654f7cf
@josesimoes
NF_Debugger and Wire Protocol are now a libraries
a92aafe 
- Add macro to incorporate them in the build.
- Add dependency on WireProtocol library
- Update CMakes accordingly.
@josesimoes
Add quiet arg to find package to decrease build verbosity
b4cf7e1
@josesimoes
Remove TI CC3220 from ChibiOS nano overlay
2ab6a20 
- No plans to use this anymore, just taking up space.
@josesimoes
Refactor header include guards
7bf6841 
- Following gcc docs on optimizations and pattern expected by the compiler.
(https://gcc.gnu.org/onlinedocs/gcc-11.2.0/cpp/Once-Only-Headers.html#Once-Only-Headers)
@josesimoes josesimoes merged commit 1e8defc into develop Aug 24, 2021
@josesimoes josesimoes deleted the develop-rework-build-system branch August 24, 2021 13:31
josesimoes added a commit to Eclo/nf-Community-Targets that referenced this pull request Aug 24, 2021
@josesimoes
Update all CMakes
4a219d9 
- Following  nanoframework/nf-interpreter#2017.
@josesimoes josesimoes mentioned this pull request Aug 24, 2021
Merged
29 tasks
josesimoes added a commit to nanoframework/nf-Community-Targets that referenced this pull request Aug 24, 2021
@josesimoes
Update all CMakes
3451b68 
- Following  nanoframework/nf-interpreter#2017.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Area: Config-and-Build

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@josesimoes @nfbot