Sysbuild: fix annoyance with tab completion #74210
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If not defined by caller, then set APPLICATION_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR. This is normally be done by `find_package(Zephyr)`, but due to the indirection introduced with fc1884e to allow applications to provide their own sysbuild entry point, then the APPLICATION_BINARY_DIR is unexpectedly set to the bin dir of the entry point. Restore the old behavior so that APPLICATION_BINARY_DIR per default again points to top-level sysbuild binary dir. Signed-off-by: Torsten Rasmussen <[email protected]>
The sysbuild part of sysbuild/application creates a sysbuild/application folder under top-level build dir. However, having a sysbuild folder at this level means that tab completion for sysbuild pre-fixed build targets will stop after completing just `sysbuild` and then show several subfolders, making it hard to see important build targets, such as: `ninja sysbuild_menuconfig`. As `sysbuild/application` is just a folder name, then move it to `_sysbuild` instead to avoid impacting tab completion for ninja and make. Also strip the `application` part in the process, as the extra folder doesn't provide any extra benefit, but is just one more level to enter when browsing the build folder structure. Signed-off-by: Torsten Rasmussen <[email protected]>
nordicjm
approved these changes
Jun 13, 2024
57300
reviewed
Jun 13, 2024
| project(sysbuild_toplevel LANGUAGES) | ||
|
|
||
| if(NOT DEFINED APPLICATION_BINARY_DIR) | ||
| set(APPLICATION_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Application Binary Directory") |
Contributor
There was a problem hiding this comment.
Seems alright, but I wonder if changing:
to CMAKE_BINARY_DIR would've been a more general fix.
Contributor
Author
There was a problem hiding this comment.
I did consider that, but simply decided to go with same pattern as:
zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake
Lines 50 to 54 in df788d0
In the sysbuild case, then CMAKE_CURRENT_BINARY_DIR == CMAKE_BINARY_DIR when sysbuild is invoked as documented / through west build.
tejlmand
added a commit
to tejlmand/fw-nrfconnect-zephyr-1
that referenced
this pull request
Jun 13, 2024
… folder If not defined by caller, then set APPLICATION_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR. This is normally be done by `find_package(Zephyr)`, but due to the indirection introduced with fc1884e to allow applications to provide their own sysbuild entry point, then the APPLICATION_BINARY_DIR is unexpectedly set to the bin dir of the entry point. Restore the old behavior so that APPLICATION_BINARY_DIR per default again points to top-level sysbuild binary dir. Upstream PR: zephyrproject-rtos/zephyr#74210 Signed-off-by: Torsten Rasmussen <[email protected]>
tejlmand
added a commit
to tejlmand/fw-nrfconnect-zephyr-1
that referenced
this pull request
Jun 13, 2024
The sysbuild part of sysbuild/application creates a sysbuild/application folder under top-level build dir. However, having a sysbuild folder at this level means that tab completion for sysbuild pre-fixed build targets will stop after completing just `sysbuild` and then show several subfolders, making it hard to see important build targets, such as: `ninja sysbuild_menuconfig`. As `sysbuild/application` is just a folder name, then move it to `_sysbuild` instead to avoid impacting tab completion for ninja and make. Also strip the `application` part in the process, as the extra folder doesn't provide any extra benefit, but is just one more level to enter when browsing the build folder structure. Upstream PR: zephyrproject-rtos/zephyr#74210 Signed-off-by: Torsten Rasmussen <[email protected]>
57300
approved these changes
Jun 13, 2024
tejlmand
added a commit
to nrfconnect/sdk-zephyr
that referenced
this pull request
Jun 14, 2024
… folder If not defined by caller, then set APPLICATION_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR. This is normally be done by `find_package(Zephyr)`, but due to the indirection introduced with fc1884e to allow applications to provide their own sysbuild entry point, then the APPLICATION_BINARY_DIR is unexpectedly set to the bin dir of the entry point. Restore the old behavior so that APPLICATION_BINARY_DIR per default again points to top-level sysbuild binary dir. Upstream PR: zephyrproject-rtos/zephyr#74210 Signed-off-by: Torsten Rasmussen <[email protected]>
tejlmand
added a commit
to nrfconnect/sdk-zephyr
that referenced
this pull request
Jun 14, 2024
The sysbuild part of sysbuild/application creates a sysbuild/application folder under top-level build dir. However, having a sysbuild folder at this level means that tab completion for sysbuild pre-fixed build targets will stop after completing just `sysbuild` and then show several subfolders, making it hard to see important build targets, such as: `ninja sysbuild_menuconfig`. As `sysbuild/application` is just a folder name, then move it to `_sysbuild` instead to avoid impacting tab completion for ninja and make. Also strip the `application` part in the process, as the extra folder doesn't provide any extra benefit, but is just one more level to enter when browsing the build folder structure. Upstream PR: zephyrproject-rtos/zephyr#74210 Signed-off-by: Torsten Rasmussen <[email protected]>
carlescufi
changed the title
anangl
pushed a commit
to anangl/sdk-zephyr
that referenced
this pull request
Jul 1, 2024
… folder If not defined by caller, then set APPLICATION_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR. This is normally be done by `find_package(Zephyr)`, but due to the indirection introduced with fc1884e to allow applications to provide their own sysbuild entry point, then the APPLICATION_BINARY_DIR is unexpectedly set to the bin dir of the entry point. Restore the old behavior so that APPLICATION_BINARY_DIR per default again points to top-level sysbuild binary dir. Upstream PR: zephyrproject-rtos/zephyr#74210 Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit c17f1bc)
anangl
pushed a commit
to anangl/sdk-zephyr
that referenced
this pull request
Jul 1, 2024
The sysbuild part of sysbuild/application creates a sysbuild/application folder under top-level build dir. However, having a sysbuild folder at this level means that tab completion for sysbuild pre-fixed build targets will stop after completing just `sysbuild` and then show several subfolders, making it hard to see important build targets, such as: `ninja sysbuild_menuconfig`. As `sysbuild/application` is just a folder name, then move it to `_sysbuild` instead to avoid impacting tab completion for ninja and make. Also strip the `application` part in the process, as the extra folder doesn't provide any extra benefit, but is just one more level to enter when browsing the build folder structure. Upstream PR: zephyrproject-rtos/zephyr#74210 Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit e4277b0)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sysbuild improvements following the application sysbuild entry point support introduced in #72923