No longer requires cmake or ninja.

.github/workflows/build-ferrocene.yml

@@ -5,45 +5,19 @@ name: workflow-build-everything-ferrocene
 run-name: Build Everything with Ferrocene
 on: [push]
 jobs:
-  job-build-threadx-staticlib:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
-      - name: Install tools
-        run: |
-          sudo apt-get update -y && sudo apt-get -y install cmake gcc gcc-arm-none-eabi build-essential ninja-build
-      - name: Compile ThreadX for Cortex-M4
-        run: |
-          cd threadx
-          cmake -Bbuild_m4 -GNinja -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake
-          cmake --build ./build_m4
-      - name: Upload staticlib
-        uses: actions/upload-artifact@master
-        with:
-          name: threadx-cm4
-          path: threadx/build_m4/libthreadx.a
   job-build-demo-app:
     runs-on: ubuntu-latest
-    needs: job-build-threadx-staticlib
     steps:
       - name: Install Arm C compiler
         run: |
           sudo apt-get update -y && sudo apt-get -y install gcc-arm-none-eabi
-          curl --proto '=https' --tlsv1.2 -LsSf https://github.com/ferrocene/criticalup/releases/download/v1.0.0-prerelease.1/criticalup-installer.sh | sh
+          curl --proto '=https' --tlsv1.2 -LsSf https://github.com/ferrocene/criticalup/releases/download/v1.0.1/criticalup-installer.sh | sh
       - name: Checkout repo
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - name: Download staticlib
-        uses: actions/download-artifact@master
-        with:
-          name: threadx-cm4
-          path: threadx/build # Where build.rs expects it
       - name: Install Ferrocene
-        env: # Or as an environment variable
+        env:
           CRITICALUP_TOKEN: ${{ secrets.CRITICALUP_TOKEN }}
         run: |
           criticalup install

.github/workflows/build.yml

@@ -5,29 +5,8 @@ name: workflow-build-everything
 run-name: Build Everything
 on: [push]
 jobs:
-  job-build-threadx-staticlib:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
-      - name: Install tools
-        run: |
-          sudo apt-get update -y && sudo apt-get -y install cmake gcc gcc-arm-none-eabi build-essential ninja-build
-      - name: Compile ThreadX for Cortex-M4
-        run: |
-          cd threadx
-          cmake -Bbuild_m4 -GNinja -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake
-          cmake --build ./build_m4
-      - name: Upload staticlib
-        uses: actions/upload-artifact@master
-        with:
-          name: threadx-cm4
-          path: threadx/build_m4/libthreadx.a
   job-build-demo-app:
     runs-on: ubuntu-latest
-    needs: job-build-threadx-staticlib
     steps:
       - name: Install Arm C compiler
         run: |
@@ -40,11 +19,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - name: Download staticlib
-        uses: actions/download-artifact@master
-        with:
-          name: threadx-cm4
-          path: threadx/build # Where build.rs expects it
       - name: Add rustup target
         run: |
           rustup target add thumbv7em-none-eabi

build.sh

@@ -1,18 +1,12 @@
 #!/bin/bash
 
-# Builds the Cortex-M4 version of ThreadX, then builds a Rust
-# application that links to it.
+# Builds the various ThreadX demo apps.
 
-# SPDX-FileCopyrightText: Copyright (c) 2023 Ferrous Systems
+# SPDX-FileCopyrightText: Copyright (c) 2024 Ferrous Systems
 # SPDX-License-Identifier: MIT OR Apache-2.0
 
 set -euo pipefail
 
-pushd threadx
-cmake -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake .
-cmake --build ./build
-popd
-
 pushd demo-app
 cargo build --release
 popd

demo-app/build.rs

@@ -5,6 +5,203 @@
 
 use std::{env, error::Error, fs, path::PathBuf};
 
+static TX_PORT_FILES: &[&str] = &[
+    "tx_thread_stack_build.S",
+    "tx_thread_schedule.S",
+    "tx_thread_system_return.S",
+    "tx_thread_context_save.S",
+    "tx_thread_context_restore.S",
+    "tx_thread_interrupt_control.S",
+    "tx_timer_interrupt.S",
+];
+
+static TX_COMMON_FILES: &[&str] = &[
+    "tx_block_allocate.c",
+    "tx_block_pool_cleanup.c",
+    "tx_block_pool_create.c",
+    "tx_block_pool_delete.c",
+    "tx_block_pool_info_get.c",
+    "tx_block_pool_initialize.c",
+    "tx_block_pool_performance_info_get.c",
+    "tx_block_pool_performance_system_info_get.c",
+    "tx_block_pool_prioritize.c",
+    "tx_block_release.c",
+    "tx_byte_allocate.c",
+    "tx_byte_pool_cleanup.c",
+    "tx_byte_pool_create.c",
+    "tx_byte_pool_delete.c",
+    "tx_byte_pool_info_get.c",
+    "tx_byte_pool_initialize.c",
+    "tx_byte_pool_performance_info_get.c",
+    "tx_byte_pool_performance_system_info_get.c",
+    "tx_byte_pool_prioritize.c",
+    "tx_byte_pool_search.c",
+    "tx_byte_release.c",
+    "tx_event_flags_cleanup.c",
+    "tx_event_flags_create.c",
+    "tx_event_flags_delete.c",
+    "tx_event_flags_get.c",
+    "tx_event_flags_info_get.c",
+    "tx_event_flags_initialize.c",
+    "tx_event_flags_performance_info_get.c",
+    "tx_event_flags_performance_system_info_get.c",
+    "tx_event_flags_set.c",
+    "tx_event_flags_set_notify.c",
+    "tx_initialize_high_level.c",
+    "tx_initialize_kernel_enter.c",
+    "tx_initialize_kernel_setup.c",
+    "tx_mutex_cleanup.c",
+    "tx_mutex_create.c",
+    "tx_mutex_delete.c",
+    "tx_mutex_get.c",
+    "tx_mutex_info_get.c",
+    "tx_mutex_initialize.c",
+    "tx_mutex_performance_info_get.c",
+    "tx_mutex_performance_system_info_get.c",
+    "tx_mutex_prioritize.c",
+    "tx_mutex_priority_change.c",
+    "tx_mutex_put.c",
+    "tx_queue_cleanup.c",
+    "tx_queue_create.c",
+    "tx_queue_delete.c",
+    "tx_queue_flush.c",
+    "tx_queue_front_send.c",
+    "tx_queue_info_get.c",
+    "tx_queue_initialize.c",
+    "tx_queue_performance_info_get.c",
+    "tx_queue_performance_system_info_get.c",
+    "tx_queue_prioritize.c",
+    "tx_queue_receive.c",
+    "tx_queue_send.c",
+    "tx_queue_send_notify.c",
+    "tx_semaphore_ceiling_put.c",
+    "tx_semaphore_cleanup.c",
+    "tx_semaphore_create.c",
+    "tx_semaphore_delete.c",
+    "tx_semaphore_get.c",
+    "tx_semaphore_info_get.c",
+    "tx_semaphore_initialize.c",
+    "tx_semaphore_performance_info_get.c",
+    "tx_semaphore_performance_system_info_get.c",
+    "tx_semaphore_prioritize.c",
+    "tx_semaphore_put.c",
+    "tx_semaphore_put_notify.c",
+    "tx_thread_create.c",
+    "tx_thread_delete.c",
+    "tx_thread_entry_exit_notify.c",
+    "tx_thread_identify.c",
+    "tx_thread_info_get.c",
+    "tx_thread_initialize.c",
+    "tx_thread_performance_info_get.c",
+    "tx_thread_performance_system_info_get.c",
+    "tx_thread_preemption_change.c",
+    "tx_thread_priority_change.c",
+    "tx_thread_relinquish.c",
+    "tx_thread_reset.c",
+    "tx_thread_resume.c",
+    "tx_thread_shell_entry.c",
+    "tx_thread_sleep.c",
+    "tx_thread_stack_analyze.c",
+    "tx_thread_stack_error_handler.c",
+    "tx_thread_stack_error_notify.c",
+    "tx_thread_suspend.c",
+    "tx_thread_system_preempt_check.c",
+    "tx_thread_system_resume.c",
+    "tx_thread_system_suspend.c",
+    "tx_thread_terminate.c",
+    "tx_thread_time_slice.c",
+    "tx_thread_time_slice_change.c",
+    "tx_thread_timeout.c",
+    "tx_thread_wait_abort.c",
+    "tx_time_get.c",
+    "tx_time_set.c",
+    "tx_timer_activate.c",
+    "tx_timer_change.c",
+    "tx_timer_create.c",
+    "tx_timer_deactivate.c",
+    "tx_timer_delete.c",
+    "tx_timer_expiration_process.c",
+    "tx_timer_info_get.c",
+    "tx_timer_initialize.c",
+    "tx_timer_performance_info_get.c",
+    "tx_timer_performance_system_info_get.c",
+    "tx_timer_system_activate.c",
+    "tx_timer_system_deactivate.c",
+    "tx_timer_thread_entry.c",
+    "tx_trace_buffer_full_notify.c",
+    "tx_trace_enable.c",
+    "tx_trace_event_filter.c",
+    "tx_trace_event_unfilter.c",
+    "tx_trace_disable.c",
+    "tx_trace_initialize.c",
+    "tx_trace_interrupt_control.c",
+    "tx_trace_isr_enter_insert.c",
+    "tx_trace_isr_exit_insert.c",
+    "tx_trace_object_register.c",
+    "tx_trace_object_unregister.c",
+    "tx_trace_user_event_insert.c",
+    "txe_block_allocate.c",
+    "txe_block_pool_create.c",
+    "txe_block_pool_delete.c",
+    "txe_block_pool_info_get.c",
+    "txe_block_pool_prioritize.c",
+    "txe_block_release.c",
+    "txe_byte_allocate.c",
+    "txe_byte_pool_create.c",
+    "txe_byte_pool_delete.c",
+    "txe_byte_pool_info_get.c",
+    "txe_byte_pool_prioritize.c",
+    "txe_byte_release.c",
+    "txe_event_flags_create.c",
+    "txe_event_flags_delete.c",
+    "txe_event_flags_get.c",
+    "txe_event_flags_info_get.c",
+    "txe_event_flags_set.c",
+    "txe_event_flags_set_notify.c",
+    "txe_mutex_create.c",
+    "txe_mutex_delete.c",
+    "txe_mutex_get.c",
+    "txe_mutex_info_get.c",
+    "txe_mutex_prioritize.c",
+    "txe_mutex_put.c",
+    "txe_queue_create.c",
+    "txe_queue_delete.c",
+    "txe_queue_flush.c",
+    "txe_queue_front_send.c",
+    "txe_queue_info_get.c",
+    "txe_queue_prioritize.c",
+    "txe_queue_receive.c",
+    "txe_queue_send.c",
+    "txe_queue_send_notify.c",
+    "txe_semaphore_ceiling_put.c",
+    "txe_semaphore_create.c",
+    "txe_semaphore_delete.c",
+    "txe_semaphore_get.c",
+    "txe_semaphore_info_get.c",
+    "txe_semaphore_prioritize.c",
+    "txe_semaphore_put.c",
+    "txe_semaphore_put_notify.c",
+    "txe_thread_create.c",
+    "txe_thread_delete.c",
+    "txe_thread_entry_exit_notify.c",
+    "txe_thread_info_get.c",
+    "txe_thread_preemption_change.c",
+    "txe_thread_priority_change.c",
+    "txe_thread_relinquish.c",
+    "txe_thread_reset.c",
+    "txe_thread_resume.c",
+    "txe_thread_suspend.c",
+    "txe_thread_terminate.c",
+    "txe_thread_time_slice_change.c",
+    "txe_thread_wait_abort.c",
+    "txe_timer_activate.c",
+    "txe_timer_change.c",
+    "txe_timer_create.c",
+    "txe_timer_deactivate.c",
+    "txe_timer_delete.c",
+    "txe_timer_info_get.c",
+];
+
 fn main() -> Result<(), Box<dyn Error>> {
     let out_dir = PathBuf::from(env::var("OUT_DIR")?);
     let crate_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
@@ -14,14 +211,18 @@ fn main() -> Result<(), Box<dyn Error>> {
     println!("cargo:rustc-link-search={}", out_dir.display());
     println!("cargo:rerun-if-changed=memory.x");
 
-    // Include our ThreadX static library
-    println!(
-        "cargo:rustc-link-search={}",
-        crate_dir.join("../threadx/build").display()
-    );
-    println!("cargo:rustc-link-lib=static=threadx");
+    // Build our ThreadX static library
+    let tx_common_dir = crate_dir.join("../threadx/common/src");
+    let tx_common_inc = crate_dir.join("../threadx/common/inc");
+    let tx_port_dir = crate_dir.join("../threadx/ports/cortex_m4/gnu/src");
+    let tx_port_inc = crate_dir.join("../threadx/ports/cortex_m4/gnu/inc");
+    cc::Build::new()
+        .include(&tx_common_inc)
+        .include(&tx_port_inc)
+        .files(TX_PORT_FILES.iter().map(|&s| tx_port_dir.join(s)))
+        .files(TX_COMMON_FILES.iter().map(|&s| tx_common_dir.join(s)))
+        .compile("threadx");
 
-    // Compile our assembly code
     cc::Build::new()
         .file("src/tx_low_level.S")
         .compile("tx_low_level");