Merge pull request #6 from soburi/merge-2.0.0

Update 2.0.0

Author: fabiobaltieri

.bazelignore

@@ -0,0 +1,4 @@
+# Don't accidentally pick up external CMake deps with Bazel build files.
+build
+# Don't treat submodules as part of this project.
+lib

.bazelrc

@@ -0,0 +1,10 @@
+# Required for new toolchain resolution API.
+build --incompatible_enable_cc_toolchain_resolution
+build --@rules_cc//cc/toolchains:experimental_enable_rule_based_toolchains
+
+# Silence all C/C++ warnings in external code.
+common --per_file_copt=external/.*@-w
+common --host_per_file_copt=external/.*@-w
+
+# Produce useful output when the build fails.
+common --verbose_failures

.bazelversion

@@ -0,0 +1 @@
+7.2.1

.github/workflows/cmake.yml

@@ -1,13 +1,18 @@
 name: CMake
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - 'iar/**'
+  pull_request:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
 jobs:
   build:
-    if: github.repository_owner == 'raspberrypi'
+    # cannot specify filter for pull_request in on: above, so do it here
+    if: github.repository_owner == 'raspberrypi' && (github.event_name != 'pull_request' || !startsWith(github.head_ref, 'iar/'))
     runs-on: [self-hosted, Linux, X64]
 
     steps:
@@ -33,17 +38,13 @@ jobs:
       # access regardless of the host operating system
       shell: bash
       working-directory: ${{github.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source 
-      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # Note the current convention is to use the -S and -B options here to specify source
+      # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPICO_SDK_TESTS_ENABLED=1
 
-    - name: Get core count
-      id: core_count
-      run : cat /proc/cpuinfo  | grep processor | wc -l
-
     - name: Build
       working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE --parallel ${{steps.core_count.outputs.output}}
+      run: cmake --build . --config $BUILD_TYPE --parallel $(nproc)

.github/workflows/macOS.yml

@@ -23,8 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           brew install cmake
-          brew tap ArmMbed/homebrew-formulae
-          brew install arm-none-eabi-gcc
+          brew install --cask gcc-arm-embedded
 
       - name: Build Project
         # bash required otherwise this mysteriously (no error) fails at "Generating cyw43_bus_pio_spi.pio.h"

.github/workflows/multi-gcc.yml

@@ -39,8 +39,8 @@
   workflow_dispatch:
   push:
     branches:
-      - 'develop'
       - 'master'
+      - 'test_workflow'
 
 jobs:
   build:
@@ -59,10 +59,6 @@
 
     - name: Checkout submodules
       run: git submodule update --init
-
-    - name: Get core count
-      id: core_count
-      run : cat /proc/cpuinfo  | grep processor | wc -l
 '''
 
 for gcc_version, toolchain_path in gcc_versions_sorted.items():
@@ -71,6 +67,6 @@
         output += "    - name: GCC {} {}\n".format(gcc_version, build_type)
         output += "      if: always()\n"
         output += "      shell: bash\n"
-        output += "      run: cd ${{{{github.workspace}}}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE={} -DPICO_TOOLCHAIN_PATH={} -DPICO_BOARD=pico_w; make -j ${{{{steps.core_count.outputs.output}}}}\n".format(build_type, toolchain_path)
+        output += "      run: cd ${{{{github.workspace}}}}; mkdir -p build; rm -rf build/*; cd build; cmake ../ -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE={} -DPICO_TOOLCHAIN_PATH={} -DPICO_BOARD=pico_w; make --output-sync=target --no-builtin-rules --no-builtin-variables -j$(nproc)\n".format(build_type, toolchain_path)
 
 print(output)

.github/workflows/scripts/generate_multi_gcc_workflow.py

@@ -3,3 +3,10 @@
 cmake-*
 .DS_Store
 build
+build-*
+
+bazel-*
+
+# Ignore until https://github.com/bazelbuild/bazel/issues/20369 is fixed.
+MODULE.bazel.lock
+__pycache__/

.gitignore

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.13...3.27)
 
 # Note: this CMakeLists.txt can be used as a top-level CMakeLists.txt for the SDK itself. For all other uses
 # it is included as a subdirectory via the pico_sdk_init() method provided by pico_sdk_init.cmake
@@ -9,6 +9,18 @@ if (NOT TARGET _pico_sdk_inclusion_marker)
 
     project(pico_sdk C CXX ASM)
 
+    string(REGEX MATCH "Clang" PICO_C_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
+    string(REGEX MATCH "GNU" PICO_C_COMPILER_IS_GNU "${CMAKE_C_COMPILER_ID}")
+    string(REGEX MATCH "IAR" PICO_C_COMPILER_IS_IAR "${CMAKE_C_COMPILER_ID}")
+    pico_register_common_scope_var(PICO_C_COMPILER_IS_CLANG)
+    pico_register_common_scope_var(PICO_C_COMPILER_IS_GNU)
+    pico_register_common_scope_var(PICO_C_COMPILER_IS_IAR)
+    pico_register_common_scope_var(PICO_SDK_VERSION_MAJOR)
+    pico_register_common_scope_var(PICO_SDK_VERSION_MINOR)
+    pico_register_common_scope_var(PICO_SDK_VERSION_REVISION)
+    pico_register_common_scope_var(PICO_SDK_VERSION_PRE_RELEASE_ID)
+    pico_register_common_scope_var(PICO_SDK_VERSION_STRING)
+
     message("Build type is ${CMAKE_BUILD_TYPE}")
     if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
         if (PICO_DEOPTIMIZED_DEBUG)
@@ -31,6 +43,9 @@ if (NOT TARGET _pico_sdk_inclusion_marker)
     add_sub_list_dirs(PICO_SDK_PRE_LIST_DIRS)
     add_sub_list_files(PICO_SDK_PRE_LIST_FILES)
 
+    # needed by certain functions
+    set(PICO_TOOLS_DIR "${CMAKE_CURRENT_LIST_DIR}/tools" CACHE INTERNAL "")
+
     add_subdirectory(tools)
     add_subdirectory(src)
 
@@ -54,4 +69,3 @@ if (NOT TARGET _pico_sdk_inclusion_marker)
         pico_promote_common_scope_vars()
     endif()
 endif()
-