Fix Windows build (#3)

Author: JR-1991

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.'cfg(target_family = "windows")']
+rustflags = ["-Ctarget-feature=+crt-static"]

.devcontainer/devcontainer.json

@@ -0,0 +1,7 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+    "ghcr.io/lee-orr/rusty-dev-containers/rust_windows_msvc:0": {},
+    "ghcr.io/devcontainers/features/rust:1": {}
+  }
+}

.github/workflows/test-build.yml

@@ -12,14 +12,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest]
+        os: [macos-14, macos-latest, ubuntu-latest, windows-latest]
         include:
-          # - os: macos-14
-          #   name: "macOS ARM"
-          # - os: macos-latest
-          #   name: "macOS x86"
-          # - os: ubuntu-latest
-          #   name: "Linux"
+          - os: macos-14
+            name: "macOS ARM"
+          - os: macos-latest
+            name: "macOS x86"
+          - os: ubuntu-latest
+            name: "Linux"
           - os: windows-latest
             name: "Windows"
 
@@ -30,5 +30,8 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Build
+        run: cargo build
+
       - name: Run tests
-        run: cargo test --verbose
+        run: cargo test

.gitignore

@@ -19,6 +19,3 @@ target/
 # Mac
 .DS_Store
 
-# Cargo
-.cargo/
-

Cargo.lock

@@ -14,7 +14,6 @@ serde = { version = "1.0.217", features = ["derive"] }
 autocxx-build = "0.27.1"
 cmake = "0.1.54"
 miette = { version = "5", features = ["fancy"] }
-vcpkg = "0.2.15"
 
 [dev-dependencies]
 pretty_assertions = "1.4.1"

Cargo.toml

@@ -28,9 +28,6 @@ const WITH_LIBXML: &str = "OFF";
 /// Whether to build with Expat XML parser support
 const WITH_EXPAT: &str = "ON";
 
-/// Whether to use static runtime libraries (enabled on Windows only)
-const WITH_STATIC_RUNTIME: &str = "ON";
-
 /// Main build script function that orchestrates the build process
 ///
 /// This function:
@@ -68,8 +65,8 @@ fn main() -> miette::Result<()> {
     // Build the C++ wrapper code and bindings
     let mut b = autocxx_build::Builder::new(rs_file, &[lib_root, &sbml_include]).build()?;
 
-    // Ensure C++17 is used for compilation
-    b.flag_if_supported("-std=c++17").compile("libsbml");
+    // Ensure C++20 is used for compilation
+    b.flag_if_supported("-std=c++17").compile("sbmlrs");
 
     Ok(())
 }
@@ -87,13 +84,15 @@ fn main() -> miette::Result<()> {
 /// * `miette::Result<String>` - Build directory path on success, error on failure
 fn build_and_link_libsbml(dep_build: &str) -> miette::Result<String> {
     let dst = if cfg!(target_os = "windows") {
+        println!("cargo:warning=Building libSBML for Windows");
         // In order to build for windows, we need to carefully tell CMake
         // where to find the libraries and headers for libexpat and zlib.
         // This is necessary because the libraries are not installed in the
         // system directories by default. Unlinke MacOS and Linux kernels
         cmake::Config::new(LIBSBML_PATH)
-            .define("CMAKE_BUILD_TYPE", "Release")
-            .define("WITH_STATIC_RUNTIME", WITH_STATIC_RUNTIME)
+            .static_crt(true)
+            .profile("Release")
+            .define("WITH_STATIC_RUNTIME", "ON")
             .define("WITH_LIBXML", WITH_LIBXML)
             .define("WITH_EXPAT", WITH_EXPAT)
             //
@@ -118,12 +117,13 @@ fn build_and_link_libsbml(dep_build: &str) -> miette::Result<String> {
             .define("BUILD_SHARED_LIBS", "OFF")
             .build()
     } else {
+        println!("cargo:warning=Building libSBML for MacOS/Linux");
         // When building for MacOS and Linux, we can just use the system libraries
         cmake::Config::new(LIBSBML_PATH)
-            .define("WITH_STATIC_RUNTIME", WITH_STATIC_RUNTIME)
+            .profile("Release")
+            .define("WITH_STATIC_RUNTIME", "OFF")
             .define("WITH_LIBXML", WITH_LIBXML)
             .define("WITH_EXPAT", WITH_EXPAT)
-            .define("LIBSBML_USE_STRICT_INCLUDES", "True")
             .build()
     };
 
@@ -151,16 +151,22 @@ fn build_and_link_libsbml(dep_build: &str) -> miette::Result<String> {
 /// # Returns
 /// * `miette::Result<String>` - Build directory path on success, error on failure
 fn build_and_link_sbml_deps() -> miette::Result<String> {
+    println!("cargo:warning=Building libSBML dependencies");
+
     // Build the dependencies for libSBML
     // We hard-code to EXPAT and ZLIB for now, but in the future this should
     // be made more flexible.
     let dst = cmake::Config::new(LIBSBML_DEPENDENCY_DIR)
-        .define("WITH_EXPAT", "True")
-        .define("WITH_LIBXML", "False")
-        .define("WITH_ZLIB", "True")
-        .define("WITH_BZIP2", "False")
-        .define("WITH_CHECK", "False")
-        .define("BUILD_SHARED_LIBS", "False")
+        .static_crt(true)
+        .profile("Release")
+        .define("WITH_STATIC_RUNTIME", "ON")
+        .define("EXPAT_MSVC_STATIC_CRT", "ON")
+        .define("WITH_EXPAT", "ON")
+        .define("WITH_LIBXML", "OFF")
+        .define("WITH_ZLIB", "ON")
+        .define("WITH_BZIP2", "OFF")
+        .define("WITH_CHECK", "OFF")
+        .define("BUILD_SHARED_LIBS", "OFF")
         .build();
 
     // Configure cargo to link against the built libraries