CMake: fix naming targets #14255

0xc0170 · 2021-02-09T17:10:44Z

Summary of changes

Follow CMake Mbed OS convention for target naming. Using mbed- prefix and - as separators along with the lower case characters. This aligns the codebase. We are porting more targets and they will follow the same naming scheme to avoid conflicts (was it xE or XE or xe and similar).

The main logic is that tools/targets.json stays, we only translate the names coming from tools to CMake targets keeping our naming scheme. Nothing else required.

Impact of changes

Migration actions required

Documentation

Pull request type

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[x] No Tests required for this change (E.g docs only update)
[] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers

Using lowercase with dashes for targets with mbed- prefix

Follow the naming for other CMake targets, using prefix mbed-, lower case with dashes

jeromecoutant

Many wrong file names

jeromecoutant · 2021-02-09T17:15:30Z

targets/TARGET_STM/TARGET_STM32F0/STM32Cube_FW/CMakeLists.txt

+        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_usart.c
+        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_usb.c
+        stm32f0xx_HAL_Driver/mbed-stm32f0xx_ll_utils.c
+        system_mbed-stm32f0xx.c


jeromecoutant · 2021-02-09T17:16:33Z

targets/TARGET_STM/TARGET_STM32F0/STM32Cube_FW/CMakeLists.txt

-        STM32F0xx_HAL_Driver/stm32f0xx_ll_usb.c
-        STM32F0xx_HAL_Driver/stm32f0xx_ll_utils.c
-        system_stm32f0xx.c
+        stm32f0xx_HAL_Driver/Legacy/stm32f0xx_hal_can_legacy.c


Real name is with upper case : STM32F0xx_HAL_Driver ?

I believe it was a search and replace oversight.
Thanks for pointing that out.

Correct, fixing now

jeromecoutant · 2021-02-09T17:16:53Z

targets/TARGET_STM/TARGET_STM32F0/TARGET_STM32F030x8/CMakeLists.txt

 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
-    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_stm32f030x8.S)
-    set(LINKER_FILE TOOLCHAIN_GCC_ARM/stm32f030x8.ld)
+    set(STARTUP_FILE TOOLCHAIN_GCC_ARM/startup_mbed-stm32f030x8.S)


ciarmcom · 2021-02-09T17:30:23Z

@0xc0170, thank you for your changes.
@ARMmbed/team-st-mcd @ARMmbed/mbed-os-maintainers please review.

hugueskamba · 2021-02-09T17:32:28Z

targets/TARGET_STM/TARGET_STM32F0/STM32Cube_FW/CMakeLists.txt

-        STM32F0xx_HAL_Driver/stm32f0xx_ll_usb.c
-        STM32F0xx_HAL_Driver/stm32f0xx_ll_utils.c
-        system_stm32f0xx.c
+        stm32f0xx_HAL_Driver/Legacy/stm32f0xx_hal_can_legacy.c


I believe it was a search and replace oversight.
Thanks for pointing that out.

CMakeLists.txt

Co-authored-by: Hugues Kamba <[email protected]>

0xc0170 · 2021-02-10T09:35:00Z

I fixed the errors with replacing the text, my initial regex was wrong :-) Please review again

0xc0170 · 2021-02-10T09:43:04Z

I added a readme section to document what we follow in CMake targets

Be consistent

tools/cmake/README.md

hugueskamba · 2021-02-10T11:18:47Z

targets/TARGET_STM/TARGET_STM32L4/STM32Cube_FW/STM32L4xx_HAL_Driver/Legacy/CMakeLists.txt

-add_library(STM32L4xxLegacyHALDriver INTERFACE)
-target_include_directories(STM32L4xxLegacyHALDriver
+
+add_library(mbed-stm32l4xxlegacy-hal-driver INTERFACE)


Suggested change

add_library(mbed-stm32l4xxlegacy-hal-driver INTERFACE)

add_library(mbed-stm32l4xx-legacy-hal-driver INTERFACE)

hugueskamba · 2021-02-10T11:19:41Z

targets/TARGET_STM/TARGET_STM32L1/TARGET_XDOT_L151CC/CMakeLists.txt

 endif()

-add_library(XDOT_L151CC INTERFACE)
+add_library(xdot-l151cc INTERFACE)


Suggested change

add_library(xdot-l151cc INTERFACE)

add_library(mbed-xdot-l151cc INTERFACE)

hugueskamba · 2021-02-10T11:21:41Z

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/TARGET_NUCLEO_F303RE/CMakeLists.txt

 # SPDX-License-Identifier: Apache-2.0

-add_library(NUCLEO_F303RE INTERFACE)
+add_library(nucleo-f303re INTERFACE)


Suggested change

add_library(nucleo-f303re INTERFACE)

add_library(mbed-nucleo-f303re INTERFACE)

hugueskamba · 2021-02-10T11:22:41Z

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_3G/CMakeLists.txt

 # SPDX-License-Identifier: Apache-2.0

-add_library(WIO_3G INTERFACE)
+add_library(wio-3g INTERFACE)


Suggested change

add_library(wio-3g INTERFACE)

add_library(mbed-wio-3g INTERFACE)

hugueskamba · 2021-02-10T11:23:11Z

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_WIO_BG96/CMakeLists.txt

 # SPDX-License-Identifier: Apache-2.0

-add_library(WIO_BG96 INTERFACE)
+add_library(wio-bg96 INTERFACE)


Suggested change

add_library(wio-bg96 INTERFACE)

add_library(mbed-wio-bg96 INTERFACE)

hugueskamba · 2021-02-10T11:23:28Z

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F469xI/TARGET_SDP_K1/CMakeLists.txt

 # SPDX-License-Identifier: Apache-2.0

-add_library(SDP_K1 INTERFACE)
+add_library(sdp-k1 INTERFACE)


Suggested change

add_library(sdp-k1 INTERFACE)

add_library(mbed-sdp-k1 INTERFACE)

hugueskamba · 2021-02-10T11:25:08Z

targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H7A3xIQ/CMakeLists.txt

 endif()

-add_library(STM32H7A3xIQ INTERFACE)
+add_library(mbed-stm32h7A3xiq INTERFACE)


Suggested change

add_library(mbed-stm32h7A3xiq INTERFACE)

add_library(mbed-stm32h7a3xiq INTERFACE)

CMakeLists.txt

Pull request has been modified.

Co-authored-by: Hugues Kamba <[email protected]>

mbed-ci · 2021-02-10T13:22:15Z

Jenkins CI Test : ❌ FAILED

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM	❌
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM	❌
jenkins-ci/mbed-os-ci_build-greentea-ARM	✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM	✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-example-ARM	✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM	✔️

jeromecoutant

Issue with:

ADV_WISE_1570
DISCO_L475VG_IOT01A
DISCO_H747I
DISCO_L4R9I
DISCO_L562QE
FF1705_L151CC
MOTE_L152RC
MTS_DRAGONFLY_L471QG
NUCLEO_F091RC
NUCLEO_F103RB
NUCLEO_F207ZG
NUCLEO_F303K8

0xc0170 · 2021-02-10T13:59:39Z

Investigating failures now

0xc0170 · 2021-02-10T15:33:00Z

ADV_WISE_1570
DISCO_L475VG_IOT01A
DISCO_H747I
DISCO_L4R9I
DISCO_L562QE
FF1705_L151CC
MOTE_L152RC
MTS_DRAGONFLY_L471QG
NUCLEO_F091RC
NUCLEO_F103RB
NUCLEO_F207ZG
NUCLEO_F303K8

I fixed all of these, found the typos in the targets. Tested randomly some locally to verify the fixes. Some were due to missing CMake targets after the last refactor.

Pull request has been modified.

0xc0170 · 2021-02-10T15:34:41Z

CI started

0xc0170 · 2021-02-10T15:53:18Z

We will need also #14266, will come in after this one if all agree.

mbed-ci · 2021-02-10T18:29:46Z

Jenkins CI Test : ❌ FAILED

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_cmake-example-ARM	✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM	✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM	✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-example-ARM	✔️
jenkins-ci/mbed-os-ci_cmake-example-test	✔️
jenkins-ci/mbed-os-ci_greentea-test	❌

0xc0170 · 2021-02-10T19:01:44Z

Test failures not related, sync error for k64f, restarting

mbed-ci · 2021-02-10T22:39:51Z

Jenkins CI Test : ✔️ SUCCESS

Build Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM	✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM	✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM	✔️
jenkins-ci/mbed-os-ci_build-example-ARM	✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_cmake-example-test	✔️
jenkins-ci/mbed-os-ci_greentea-test	✔️

0xc0170 added 2 commits February 9, 2021 15:23

CMake: add naming convention for mbed targets

39ab9c8

Using lowercase with dashes for targets with mbed- prefix

CMake STM32: fix targets naming

544e5b9

Follow the naming for other CMake targets, using prefix mbed-, lower case with dashes

0xc0170 requested review from hugueskamba, jeromecoutant, rajkan01 and rwalton-arm February 9, 2021 17:10

CMake: fix the comment for naming targets

e88e114

jeromecoutant suggested changes Feb 9, 2021

View reviewed changes

ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Feb 9, 2021

ciarmcom requested review from a team February 9, 2021 17:30

ciarmcom added the needs: review label Feb 9, 2021

hugueskamba reviewed Feb 9, 2021

View reviewed changes

0xc0170 and others added 2 commits February 10, 2021 08:46

Update CMakeLists.txt

4536a5e

Co-authored-by: Hugues Kamba <[email protected]>

CMake STM32: fix search and replace errors

b3181a1

0xc0170 requested a review from jeromecoutant February 10, 2021 09:34

CMake readme: add naming scheme for our CMake targets

a6915af

Be consistent

0xc0170 force-pushed the cmake-fix-naming-targets branch from d6e2495 to a6915af Compare February 10, 2021 09:43

0xc0170 requested a review from hugueskamba February 10, 2021 09:57

CMake STM32: fix missing mbed for some nucleo targets

00e83ce

hugueskamba previously requested changes Feb 10, 2021

View reviewed changes

mergify bot added needs: work and removed needs: review labels Feb 10, 2021

hugueskamba reviewed Feb 10, 2021

View reviewed changes

CMakeLists.txt Outdated Show resolved Hide resolved

CMake STM32: fix missed targets with prefix

ef98060

CMake: fix wording in naming

b999008

Co-authored-by: Hugues Kamba <[email protected]>

mergify bot removed the needs: work label Feb 10, 2021

jeromecoutant suggested changes Feb 10, 2021

View reviewed changes

0xc0170 added 2 commits February 10, 2021 15:23

CMake STM32: fixing prefixes in the targets

2d3bf3f

CMake STM32H7: fix disco m4/m7 targets

fdef59f

0xc0170 requested review from hugueskamba and jeromecoutant February 10, 2021 15:35

rwalton-arm mentioned this pull request Feb 10, 2021

Fix up some ST CMake targets #14266

Merged

mergify bot added needs: work and removed needs: CI labels Feb 10, 2021

0xc0170 added needs: CI and removed needs: work labels Feb 10, 2021

0xc0170 added ready for merge and removed needs: CI labels Feb 11, 2021

0xc0170 merged commit 4236db4 into ARMmbed:master Feb 11, 2021

0xc0170 deleted the cmake-fix-naming-targets branch February 11, 2021 08:02

mergify bot removed the ready for merge label Feb 11, 2021

0xc0170 mentioned this pull request Feb 11, 2021

CMake: Refactor NXP targets #14268

Merged

mbedmain added release-version: 6.8.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Feb 16, 2021

	add_library(mbed-stm32l4xxlegacy-hal-driver INTERFACE)
	add_library(mbed-stm32l4xx-legacy-hal-driver INTERFACE)

	add_library(xdot-l151cc INTERFACE)
	add_library(mbed-xdot-l151cc INTERFACE)

	add_library(nucleo-f303re INTERFACE)
	add_library(mbed-nucleo-f303re INTERFACE)

	add_library(wio-3g INTERFACE)
	add_library(mbed-wio-3g INTERFACE)

	add_library(wio-bg96 INTERFACE)
	add_library(mbed-wio-bg96 INTERFACE)

	add_library(sdp-k1 INTERFACE)
	add_library(mbed-sdp-k1 INTERFACE)

	add_library(mbed-stm32h7A3xiq INTERFACE)
	add_library(mbed-stm32h7a3xiq INTERFACE)

Uh oh!

CMake: fix naming targets #14255

CMake: fix naming targets #14255

Uh oh!

Conversation

0xc0170 commented Feb 9, 2021

Summary of changes

Impact of changes

Migration actions required

Documentation

Pull request type

Test results

Reviewers

Uh oh!

jeromecoutant left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ciarmcom commented Feb 9, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

0xc0170 commented Feb 10, 2021

Uh oh!

0xc0170 commented Feb 10, 2021

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mbed-ci commented Feb 10, 2021

Jenkins CI Test : ❌ FAILED

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

Uh oh!

jeromecoutant left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xc0170 commented Feb 10, 2021

Uh oh!

0xc0170 commented Feb 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Feb 10, 2021

Uh oh!

0xc0170 commented Feb 10, 2021

Uh oh!

mbed-ci commented Feb 10, 2021

Jenkins CI Test : ❌ FAILED

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

Uh oh!

0xc0170 commented Feb 10, 2021

Uh oh!

mbed-ci commented Feb 10, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

jeromecoutant left a comment •

edited

Loading

0xc0170 commented Feb 10, 2021 •

edited

Loading