Merge pull request #4 from ARMmbed/PR_ACI

jeromecoutant · web-flow · commit c5d856068051 · 2021-07-08T15:59:44.000+02:00
Update ACI build
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: CI
+name: ACI
 
 on:
   pull_request:
@@ -20,8 +20,7 @@ jobs:
           run: |
             pip3 list
             git clone https://github.com/ARMmbed/mbed-os.git
-            echo "**** copy custom_targets.json ***"
-            python3 automatic_build.py
+            python3 aci_build.py
 
   CLI2:
     runs-on: ubuntu-latest
@@ -38,5 +37,4 @@ jobs:
           run: |
             pip3 list
             git clone https://github.com/ARMmbed/mbed-os.git
-            echo "**** copy custom_targets.json ***"
-            python3 automatic_build.py -c
+            python3 aci_build.py -c
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(TARGET_STM32F0)
+add_subdirectory(TARGET_STM32F1)
+add_subdirectory(TARGET_STM32F2)
+add_subdirectory(TARGET_STM32F3)
+add_subdirectory(TARGET_STM32F4)
+add_subdirectory(TARGET_STM32F7)
+add_subdirectory(TARGET_STM32G0)
+add_subdirectory(TARGET_STM32G4)
+add_subdirectory(TARGET_STM32H7)
+add_subdirectory(TARGET_STM32L0)
+add_subdirectory(TARGET_STM32L1)
+add_subdirectory(TARGET_STM32L4)
+add_subdirectory(TARGET_STM32L5)
+add_subdirectory(TARGET_STM32WB)
+add_subdirectory(TARGET_STM32WL)
diff --git a/README.md b/README.md
@@ -29,12 +29,23 @@ Copy custom_targets.json
 cp stm32customtargets/custom_targets.json .
 ````
 
-Then build your target!
+Then build your target with
 
+- CLI1:
 ````
 mbed compile -m XXX -t XXX
 ````
 
+- CLI2:
+
+Add in the application CMakeLists.txt:
+````
+add_subdirectory(stm32customtargets)
+````
+And build:
+````
+mbedtools compile -m XXX -t XXX
+````
 
 
 # STM32F1
diff --git a/TARGET_STM32F0/CMakeLists.txt b/TARGET_STM32F0/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32F2/CMakeLists.txt b/TARGET_STM32F2/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32F3/CMakeLists.txt b/TARGET_STM32F3/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32F4/CMakeLists.txt b/TARGET_STM32F4/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32F7/CMakeLists.txt b/TARGET_STM32F7/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32G0/CMakeLists.txt b/TARGET_STM32G0/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32G4/CMakeLists.txt b/TARGET_STM32G4/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32H7/CMakeLists.txt b/TARGET_STM32H7/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32L0/CMakeLists.txt b/TARGET_STM32L0/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32L1/CMakeLists.txt b/TARGET_STM32L1/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32L4/CMakeLists.txt b/TARGET_STM32L4/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32L5/CMakeLists.txt b/TARGET_STM32L5/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/TARGET_STM32WB/CMakeLists.txt b/TARGET_STM32WB/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/aci_build.py b/aci_build.py
@@ -108,11 +108,25 @@
 
 include(${MBED_PATH}/tools/cmake/app.cmake)
 
+add_subdirectory(TARGET_STM32F0)
+add_subdirectory(TARGET_STM32F1)
+add_subdirectory(TARGET_STM32F2)
+add_subdirectory(TARGET_STM32F3)
+add_subdirectory(TARGET_STM32F4)
+add_subdirectory(TARGET_STM32F7)
+add_subdirectory(TARGET_STM32G0)
+add_subdirectory(TARGET_STM32G4)
+add_subdirectory(TARGET_STM32H7)
+add_subdirectory(TARGET_STM32L0)
+add_subdirectory(TARGET_STM32L1)
+add_subdirectory(TARGET_STM32L4)
+add_subdirectory(TARGET_STM32L5)
+add_subdirectory(TARGET_STM32WB)
+add_subdirectory(TARGET_STM32WL)
+
 add_subdirectory(${MBED_PATH})
 
 add_executable(${APP_TARGET})
-add_subdirectory(TARGET_STM32F1)
-add_subdirectory(TARGET_STM32WL)
 
 mbed_configure_app_target(${APP_TARGET})
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Copyright (c) 2020 ARM Limited. All rights reserved.`
	`2`	`+# SPDX-License-Identifier: Apache-2.0`