commit a9efb1dae602500d2dbcd620fad7542d90b2f69d
author Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no> Thu Jun 13 13:08:09 2024 +0200
committer Anas Nashif <anas.nashif@intel.com> Mon Jun 17 12:09:45 2024 -0400
tree 63afcd5730e42600b335bba61d680caa334bc56c
parent 8defc560fe8fafe007604f8193fe299d284055b3

west: update build extension command to use APP_DIR

`west build` can be invoked without specifying the source directory when
being invoked from the source directory itself.
When using `west build` for incremental builds, then the build command
will examine the CMake cache to determine the application dir by using
the value of CMAKE_HOME_DIRECTORY.

With sysbuild, this leads to the wrong assumption that the sysbuild
itself is the application to build.

Instead, have west build look for APP_DIR which points to the correct
source dir when sysbuild is used. Use APPLICATION_SOURCE_DIR when
APP_DIR is not set, as this indicates a no-sysbuild build.

Keep CMAKE_HOME_DIRECTORY behavior as last fallback mechanism.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>

scripts/west_commands/build.py

diff --git a/scripts/west_commands/build.py b/scripts/west_commands/build.py
index c137d1a..0a241f3 100644
--- a/scripts/west_commands/build.py
+++ b/scripts/west_commands/build.py
@@ -424,7 +424,14 @@
         if self.args.source_dir:
             source_dir = self.args.source_dir
         elif self.cmake_cache:
-            source_dir = self.cmake_cache.get('CMAKE_HOME_DIRECTORY')
+            source_dir = self.cmake_cache.get('APP_DIR')
+
+            if not source_dir:
+                source_dir = self.cmake_cache.get('APPLICATION_SOURCE_DIR')
+
+            if not source_dir:
+                source_dir = self.cmake_cache.get('CMAKE_HOME_DIRECTORY')
+
             if not source_dir:
                 # This really ought to be there. The build directory
                 # must be corrupted somehow. Let's see what we can do.