[NXP][scripts][build_examples] Adding differentiator to support both gn and cmake build systems

Signed-off-by: Dina Benamar <dina.benamarelmaaroufi@nxp.com>

Author: dinabenamar

.github/workflows/examples-nxp.yaml

@@ -229,6 +229,7 @@ jobs:
                       --target nxp-rw61x-freertos-all-clusters-wifi \
                       --target nxp-rw61x-freertos-all-clusters-thread \
                       --target nxp-rw61x-freertos-all-clusters-thread-wifi \
+                      --target nxp-rw61x-freertos-all-clusters-wifi-ota-cmake \
                       build \
                       --copy-artifacts-to out/artifacts \
                   "

scripts/build/build/targets.py

@@ -28,7 +28,7 @@
 from builders.mw320 import MW320App, MW320Builder
 from builders.nrf import NrfApp, NrfBoard, NrfConnectBuilder
 from builders.nuttx import NuttXApp, NuttXBoard, NuttXBuilder
-from builders.nxp import NxpApp, NxpBoard, NxpBuilder, NxpOsUsed
+from builders.nxp import NxpApp, NxpBoard, NxpBuilder, NxpOsUsed, NxpBuildSystem
 from builders.openiotsdk import OpenIotSdkApp, OpenIotSdkBuilder, OpenIotSdkCryptoBackend
 from builders.qpg import QpgApp, QpgBoard, QpgBuilder
 from builders.stm32 import stm32App, stm32Board, stm32Builder
@@ -540,6 +540,7 @@ def BuildNxpTarget():
     target.AppendModifier(name="matter-shell", enable_shell=True).ExceptIfRe('k32w0|k32w1')
     target.AppendModifier(name="factory-build", enable_factory_data_build=True).OnlyIfRe('rw61x')
     target.AppendModifier(name="frdm", board_variant="frdm").OnlyIfRe('rw61x')
+    target.AppendModifier(name="cmake", build_system=NxpBuildSystem.CMAKE).OnlyIfRe('rw61x')
 
     return target
 

scripts/build/builders/nxp.py

@@ -33,6 +33,17 @@ def OsEnv(self):
         else:
             raise Exception('Unknown OS type: %r' % self)
 
+class NxpBuildSystem(Enum):
+    GN = auto()
+    CMAKE = auto()
+
+    def BuildSystem(self):
+        if self == NxpBuildSystem.GN:
+            return 'gn'
+        elif self == NxpBuildSystem.CMAKE:
+            return 'cmake'
+        else:
+            raise Exception('Unknown build system: %r' % self)
 
 class NxpBoard(Enum):
     K32W0 = auto()
@@ -118,6 +129,7 @@ def __init__(self,
                  app: NxpApp = NxpApp.LIGHTING,
                  board: NxpBoard = NxpBoard.K32W0,
                  os_env: NxpOsUsed = NxpOsUsed.FREERTOS,
+                 build_system: NxpBuildSystem = NxpBuildSystem.GN,
                  low_power: bool = False,
                  smu2: bool = False,
                  enable_factory_data: bool = False,
@@ -141,6 +153,7 @@ def __init__(self,
         self.app = app
         self.board = board
         self.os_env = os_env
+        self.build_system = build_system
         self.low_power = low_power
         self.smu2 = smu2
         self.enable_factory_data = enable_factory_data
@@ -210,6 +223,7 @@ def GnBuildArgs(self):
 
     def CmakeBuildFlags(self):
         flags = []
+
         if self.enable_factory_data:
             if self.os_env == NxpOsUsed.ZEPHYR:
                 flags.append('-DFILE_SUFFIX=fdata')
@@ -288,7 +302,7 @@ def generate(self):
                     elif p.sdk_name == 'common':
                         cmd += 'export NXP_SDK_ROOT="' + str(p.sdk_storage_location_abspath) + '" \n '
 
-            if self.board == NxpBoard.RW61X:
+            if self.build_system == NxpBuildSystem.CMAKE:
                 cmd += '''
                 cmake -GNinja {build_flags} -H{example_folder} -B{out_folder}
                 '''.format(
@@ -297,7 +311,7 @@ def generate(self):
                     out_folder=self.output_dir).strip()
                 self._Execute(['bash', '-c', cmd], title='Generating ' + self.identifier)
 
-            else:
+            elif self.build_system == NxpBuildSystem.GN:
                 # add empty space at the end to avoid concatenation issue when there is no --args
                 cmd += 'gn gen --check --fail-on-unused-args --export-compile-commands --root=%s ' % self.root
 
@@ -333,10 +347,19 @@ def build_outputs(self):
                     os.path.join(self.output_dir, 'zephyr', 'zephyr.map'),
                     f'{name}.map')
         else:
-            yield BuilderOutput(
-                os.path.join(self.output_dir, name),
-                f'{name}.elf')
-            if self.options.enable_link_map_file:
+            if self.build_system == NxpBuildSystem.GN:
                 yield BuilderOutput(
-                    os.path.join(self.output_dir, f'{name}.map'),
-                    f'{name}.map')
+                    os.path.join(self.output_dir, name),
+                    f'{name}.elf')
+                if self.options.enable_link_map_file:
+                    yield BuilderOutput(
+                        os.path.join(self.output_dir, f'{name}.map'),
+                        f'{name}.map')
+            elif self.build_system == NxpBuildSystem.CMAKE:
+                yield BuilderOutput(
+                    os.path.join(self.output_dir, 'out/debug', name),
+                    f'{name}.elf')
+                if self.options.enable_link_map_file:
+                    yield BuilderOutput(
+                        os.path.join(self.output_dir, 'out/debug', f'{name}.map'),
+                        f'{name}.map')

scripts/build/testdata/all_targets_linux_x64.txt

@@ -9,11 +9,11 @@ efr32-{brd2704b,brd4316a,brd4317a,brd4318a,brd4319a,brd4186a,brd4187a,brd2601b,b
 esp32-{m5stack,c3devkit,devkitc,qemu}-{all-clusters,all-clusters-minimal,energy-management,ota-provider,ota-requestor,shell,light,lock,bridge,temperature-measurement,ota-requestor,tests}[-rpc][-ipv6only][-tracing]
 genio-lighting-app
 linux-fake-tests[-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-pw-fuzztest][-coverage][-dmalloc][-clang]
-linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,light-data-model-no-unique-id,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,fabric-admin,fabric-bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,microwave-oven,refrigerator,rvc,air-purifier,lit-icd,air-quality-sensor,network-manager,energy-management}[-nodeps][-nlfaultinject][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-pw-fuzztest][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui][-evse-test-event][-enable-dnssd-tests][-disable-dnssd-tests][-chip-casting-simplified][-data-model-check][-data-model-disabled][-data-model-enabled][-check-failure-die]
+linux-{x64,arm64}-{rpc-console,all-clusters,all-clusters-minimal,chip-tool,thermostat,java-matter-controller,kotlin-matter-controller,minmdns,light,light-data-model-no-unique-id,lock,shell,ota-provider,ota-requestor,simulated-app1,simulated-app2,python-bindings,tv-app,tv-casting-app,bridge,fabric-admin,fabric-bridge,tests,chip-cert,address-resolve-tool,contact-sensor,dishwasher,microwave-oven,refrigerator,rvc,air-purifier,lit-icd,air-quality-sensor,network-manager,energy-management}[-nodeps][-nlfaultinject][-platform-mdns][-minmdns-verbose][-libnl][-same-event-loop][-no-interactive][-ipv6only][-no-ble][-no-wifi][-no-thread][-mbedtls][-boringssl][-asan][-tsan][-ubsan][-libfuzzer][-ossfuzz][-pw-fuzztest][-coverage][-dmalloc][-clang][-test][-rpc][-with-ui][-evse-test-event][-enable-dnssd-tests][-disable-dnssd-tests][-chip-casting-simplified][-data-model-check][-data-model-disabled][-data-model-enabled]
 linux-x64-efr32-test-runner[-clang]
 imx-{chip-tool,lighting-app,thermostat,all-clusters-app,all-clusters-minimal-app,ota-provider-app}[-release]
 infineon-psoc6-{lock,light,all-clusters,all-clusters-minimal}[-ota][-updateimage][-trustm]
-nxp-{k32w0,k32w1,rw61x,mcxw71}-{zephyr,freertos}-{lighting,contact-sensor,all-clusters,laundry-washer,thermostat}[-factory][-low-power][-lit][-fro32k][-smu2][-dac-conversion][-rotating-id][-sw-v2][-ota][-wifi][-thread][-matter-shell]
+nxp-{k32w0,k32w1,rw61x,mcxw71}-{zephyr,freertos}-{lighting,contact-sensor,all-clusters,laundry-washer,thermostat}[-factory][-low-power][-lit][-fro32k][-smu2][-dac-conversion][-rotating-id][-sw-v2][-ota][-wifi][-thread][-matter-shell][-factory-build][-frdm][-cmake]
 mbed-cy8cproto_062_4343w-{lock,light,all-clusters,all-clusters-minimal,pigweed,ota-requestor,shell}[-release][-develop][-debug]
 mw320-all-clusters-app
 nrf-{nrf5340dk,nrf52840dk,nrf52840dongle}-{all-clusters,all-clusters-minimal,lock,light,light-switch,shell,pump,pump-controller,window-covering}[-rpc]