Preparation to switch to GNU Toolchain

Author: Tobias Kaupat

README.md

@@ -22,10 +22,32 @@ After cloning without `--recurse-submodules` the submodules must be loaded
 
 * llvm-config is missing on windows
 
+## Setup
+
+For debugging the GNU Toolchain is required
+
+    rustup toolchain install stable-x86_64-pc-windows-gnu
+    rustup default stable-x86_64-pc-windows-gnu
+    
+MSVC Toolchain is not working for debugging:
+
+    rustup default stable-msvc
+    
+
+## Build
+
+    cargo build
+    
+To see all errors use:
+
+    cargo build -vv
+
 ## Generate C Bindings
 
 C-Bindings are based on `src/bindings.h` and generated with [bindgen](https://github.com/rust-lang/rust-bindgen)
 
+`bindgen` is executed during build in `build.rs`.
+
 
 
 

build.rs

@@ -13,28 +13,37 @@ fn main() {
         .file("c-lib/add.c")
         .compile("libadd.a");
 
-
-
     // Build FreeRTOS for Windows
     let freertos_src_path = PathBuf::from("FreeRTOS/FreeRTOS/Source/");
     let freertos_plus_src_path = PathBuf::from("FreeRTOS/FreeRTOS-Plus/Source/");
     let freertos_demo_path = PathBuf::from("FreeRTOS/FreeRTOS/Demo");
+    //let demo = "WIN32-MingW";
+    let port = "MSVC-MingW";
+
+    let demo = "WIN32-MSVC";
+    //let port = "MSVC-MingW";
 
     cc::Build::new()
         // TODO: This is the windows specific part that needs to be env specific
         .include(freertos_src_path.join("include"))
-        //.include(freertos_demo_path.join("WIN32-MSVC"))
-        .include(freertos_demo_path.join("WIN32-MSVC/Trace_Recorder_Configuration"))
+        //.include(freertos_demo_path.join(demo)
+        .include(freertos_demo_path.join(demo).join("Trace_Recorder_Configuration"))
         .include(freertos_plus_src_path.join("FreeRTOS-Plus-Trace/Include"))
-        .include(freertos_src_path.join("portable/MSVC-MingW"))
-        .file(freertos_demo_path.join("WIN32-MSVC/Run-time-stats-utils.c"))
+        .include(freertos_src_path.join("portable").join(port))
+        // TODO: Make runtime stats not needed or move to /src/ports/win/...
+        .file(freertos_demo_path.join(demo).join("Run-time-stats-utils.c"))
 
         // Files related to port
-        .include("src/ports/win")
-        .file("src/ports/win/hooks.c")
+        .include("src/freertos/ports/win")
+        .file("src/freertos/ports/win/hooks.c")
+        .file("src/freertos/ports/win/heap.c")
+        .file("src/freertos/freertos_shim.c")
 
+        // FreeRTOS Plus Trace is needed for windows Demo
         .file(freertos_plus_src_path.join("FreeRTOS-Plus-Trace/trcKernelPort.c"))
         .file(freertos_plus_src_path.join("FreeRTOS-Plus-Trace/trcSnapshotRecorder.c"))
+
+        // FreeRTOS
         .file(freertos_src_path.join("croutine.c"))
         .file(freertos_src_path.join("event_groups.c"))
         .file(freertos_src_path.join("portable/MemMang/heap_5.c"))
@@ -43,9 +52,7 @@ fn main() {
         .file(freertos_src_path.join("list.c"))
         .file(freertos_src_path.join("queue.c"))
         .file(freertos_src_path.join("tasks.c"))
-        .file(freertos_src_path.join("portable/MSVC-MingW/port.c"))
-
-        //.file("src/freertos_shim.c")
+        .file(freertos_src_path.join("portable").join(port).join("port.c"))
 
         .compile("libfreertos.a");
 
@@ -67,10 +74,12 @@ fn main() {
         // The input header we would like to generate
         // bindings for.
         .header("src/bindings.h")
+        .header("src/freertos/freertos_shim.h")
         //portmacro.h
         //.clang_arg(format!("-I{}", freertos_src_path.join("portable/MSVC-MingW").to_str().unwrap()))
-        .clang_arg(format!("-I{}", freertos_demo_path.join("WIN32-MSVC").to_str().unwrap()))
-        .clang_arg(format!("-I{}", freertos_demo_path.join("WIN32-MSVC/Trace_Recorder_Configuration").to_str().unwrap()))
+        .clang_arg(format!("-I{}", freertos_src_path.join("include").to_str().unwrap()))
+        .clang_arg(format!("-I{}", freertos_demo_path.join(demo).to_str().unwrap()))
+        .clang_arg(format!("-I{}", freertos_demo_path.join(demo).join("Trace_Recorder_Configuration").to_str().unwrap()))
         .clang_arg(format!("-I{}", freertos_plus_src_path.join("FreeRTOS-Plus-Trace/Include").to_str().unwrap()))
         // Make the generated code #![no_std] compatible
         .use_core()

src/bindings.h

@@ -1,3 +1,4 @@
 #include "../c-lib/add.h"
+#include "FreeRTOS.h"
+#include "./freertos/ports/include/heap.h"
 
-#include "../FreeRTOS/FreeRTOS/Source/include/FreeRTOS.h"