refactor: replace cmake with cc crate, add CI check for generated headers

Remove the cmake build dependency so downstream users only need a C
compiler to build this crate. The cmake-generated headers (config.h,
export.h) are now pre-committed under generated/ and compiled directly
via the cc crate.

Add scripts/generate-headers.sh to regenerate them when the libversion
submodule is updated, and a CI job to verify they stay in sync.

Signed-off-by: Xiangzhe <xiangzhedev@gmail.com>

Author: xz-dev

.github/workflows/ci.yml

@@ -8,6 +8,22 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
+  check-generated:
+    name: Check Generated Headers
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: true
+      - run: sudo apt-get update && sudo apt-get install -y cmake
+      - run: bash scripts/generate-headers.sh
+      - name: Verify generated headers are up to date
+        run: |
+          if ! git diff --exit-code generated/; then
+            echo "::error::Generated headers are out of date. Run 'bash scripts/generate-headers.sh' and commit the changes."
+            exit 1
+          fi
+
   clippy-sarif:
     name: Clippy SARIF
     runs-on: ubuntu-latest
@@ -21,7 +37,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
-      - run: sudo apt-get update && sudo apt-get install -y cmake libclang-dev
+      - run: sudo apt-get update && sudo apt-get install -y libclang-dev
       - run: cargo install clippy-sarif sarif-fmt
       - run: >
           cargo clippy --all-targets --all-features --message-format=json -- -Dwarnings |
@@ -51,7 +67,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
-      - run: sudo apt-get update && sudo apt-get install -y cmake libclang-dev
+      - run: sudo apt-get update && sudo apt-get install -y libclang-dev
       - run: cargo clippy --all-targets --all-features -- -D warnings
 
   test:
@@ -62,5 +78,5 @@ jobs:
         with:
           submodules: true
       - uses: dtolnay/rust-toolchain@stable
-      - run: sudo apt-get update && sudo apt-get install -y cmake libclang-dev
+      - run: sudo apt-get update && sudo apt-get install -y libclang-dev
       - run: cargo test

Cargo.lock

@@ -9,9 +9,8 @@ license = "MIT"
 repository = "https://github.com/DUpdateSystem/libversion-sys"
 homepage = "https://github.com/DUpdateSystem/libversion-sys"
 documentation = "https://docs.rs/libversion-sys"
-exclude = [".github/", ".gitignore", ".gitmodules"]
+exclude = [".github/", ".gitignore", ".gitmodules", "scripts/"]
 
 [build-dependencies]
-cmake = "0.1"
 cc = "1"
 bindgen = "0.72"

Cargo.toml

@@ -1,75 +1,25 @@
 use std::env;
-use std::path::{Path, PathBuf};
-
-/// When cross-compiling for Android, the `cmake` crate (cmake-rs) sets
-/// `CMAKE_SYSTEM_NAME=Android` but does **not** set `CMAKE_ANDROID_NDK`.
-/// CMake ≥ 3.21's `Platform/Android-Determine.cmake` then fails because it
-/// cannot locate the NDK.
-///
-/// Detection strategy:
-///   1. Check well-known environment variables (`ANDROID_NDK_ROOT`, etc.).
-///   2. Infer from the C compiler path that `cc` selects for this target.
-///      NDK compilers live at `<NDK>/toolchains/llvm/prebuilt/<host>/bin/…`,
-///      so we walk up from the compiler looking for the `toolchains` dir.
-fn detect_android_ndk() -> Option<PathBuf> {
-    // 1. Prefer explicit env vars (same ones CMake itself checks)
-    for var in ["ANDROID_NDK_ROOT", "ANDROID_NDK_HOME", "ANDROID_NDK"] {
-        if let Ok(val) = env::var(var) {
-            let p = PathBuf::from(&val);
-            if p.is_dir() {
-                return Some(p);
-            }
-        }
-    }
-
-    // 2. Infer from the C compiler path
-    let compiler = cc::Build::new()
-        .cargo_metadata(false)
-        .opt_level(0)
-        .warnings(false)
-        .try_get_compiler()
-        .ok()?;
-    let cc_path = compiler.path().canonicalize().ok()?;
-    let mut dir: &Path = cc_path.parent()?;
-    loop {
-        if dir.file_name().and_then(|n| n.to_str()) == Some("toolchains")
-            && dir.join("llvm").is_dir()
-        {
-            return dir.parent().map(|p| p.to_path_buf());
-        }
-        dir = dir.parent()?;
-    }
-}
+use std::path::PathBuf;
 
 fn main() {
-    let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
-
-    // Build libversion static library using cmake
-    let mut cmake_cfg = cmake::Config::new("libversion");
-    cmake_cfg.build_target("libversion_static");
-
-    // Work around cmake-rs not setting CMAKE_ANDROID_NDK for Android targets.
-
-    if target_os == "android"
-        && let Some(ndk_root) = detect_android_ndk()
-    {
-        cmake_cfg.define("CMAKE_ANDROID_NDK", &ndk_root);
-    }
-
-    let dst = cmake_cfg.build();
-
-    let build_dir = dst.join("build").join("libversion");
-    println!("cargo:rustc-link-search=native={}", build_dir.display());
-    println!("cargo:rustc-link-lib=static=version");
+    // Build libversion static library using cc.
+    // The cmake-generated headers (config.h, export.h) are pre-committed under
+    // generated/ — run `bash scripts/generate-headers.sh` to regenerate them
+    // whenever the libversion submodule is updated.
+    cc::Build::new()
+        .file("libversion/libversion/compare.c")
+        .file("libversion/libversion/private/compare.c")
+        .file("libversion/libversion/private/parse.c")
+        .include("libversion") // source headers (libversion/version.h, etc.)
+        .include("generated") // pre-generated headers (libversion/config.h, libversion/export.h)
+        .define("LIBVERSION_STATIC_DEFINE", None)
+        .compile("version");
 
     // Generate FFI bindings via bindgen
     let bindings = bindgen::Builder::default()
         .header("wrapper.h")
-        // cmake-generated headers (config.h, export.h) are in build/libversion/
-        .clang_arg(format!("-I{}", dst.join("build").display()))
-        // source headers are under libversion/ (the submodule root)
-        .clang_arg("-Ilibversion")
-        // static build: LIBVERSION_EXPORT expands to nothing
+        .clang_arg("-Igenerated") // pre-generated config.h, export.h
+        .clang_arg("-Ilibversion") // source headers
         .clang_arg("-DLIBVERSION_STATIC_DEFINE")
         .default_enum_style(bindgen::EnumVariation::Consts)
         .allowlist_function("version_compare.*")

build.rs

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018 Dmitry Marakasov <amdmi3@amdmi3.ru>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef LIBVERSION_CONFIG_H
+#define LIBVERSION_CONFIG_H
+
+#define LIBVERSION_VERSION_MAJOR 3
+#define LIBVERSION_VERSION_MINOR 0
+#define LIBVERSION_VERSION_PATCH 4
+
+#define LIBVERSION_VERSION "3.0.4"
+
+#endif /* LIBVERSION_CONFIG_H */

generated/libversion/config.h

@@ -0,0 +1,43 @@
+
+#ifndef LIBVERSION_EXPORT_H
+#define LIBVERSION_EXPORT_H
+
+#ifdef LIBVERSION_STATIC_DEFINE
+#  define LIBVERSION_EXPORT
+#  define LIBVERSION_NO_EXPORT
+#else
+#  ifndef LIBVERSION_EXPORT
+#    ifdef libversion_EXPORTS
+        /* We are building this library */
+#      define LIBVERSION_EXPORT __attribute__((visibility("default")))
+#    else
+        /* We are using this library */
+#      define LIBVERSION_EXPORT __attribute__((visibility("default")))
+#    endif
+#  endif
+
+#  ifndef LIBVERSION_NO_EXPORT
+#    define LIBVERSION_NO_EXPORT __attribute__((visibility("hidden")))
+#  endif
+#endif
+
+#ifndef LIBVERSION_DEPRECATED
+#  define LIBVERSION_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef LIBVERSION_DEPRECATED_EXPORT
+#  define LIBVERSION_DEPRECATED_EXPORT LIBVERSION_EXPORT LIBVERSION_DEPRECATED
+#endif
+
+#ifndef LIBVERSION_DEPRECATED_NO_EXPORT
+#  define LIBVERSION_DEPRECATED_NO_EXPORT LIBVERSION_NO_EXPORT LIBVERSION_DEPRECATED
+#endif
+
+/* NOLINTNEXTLINE(readability-avoid-unconditional-preprocessor-if) */
+#if 0 /* DEFINE_NO_DEPRECATED */
+#  ifndef LIBVERSION_NO_DEPRECATED
+#    define LIBVERSION_NO_DEPRECATED
+#  endif
+#endif
+
+#endif /* LIBVERSION_EXPORT_H */

generated/libversion/export.h

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Regenerate cmake-produced headers (config.h, export.h) from the libversion
+# submodule so that the normal build (which uses the cc crate) never needs
+# cmake installed.
+#
+# Usage:  bash scripts/generate-headers.sh
+#
+# Run this script whenever the libversion submodule is updated.
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+TMPDIR="$(mktemp -d)"
+
+trap 'rm -rf "$TMPDIR"' EXIT
+
+echo "Running cmake configure on libversion submodule..."
+cmake -S "$PROJECT_ROOT/libversion" -B "$TMPDIR" >/dev/null 2>&1
+
+mkdir -p "$PROJECT_ROOT/generated/libversion"
+cp "$TMPDIR/libversion/config.h" "$PROJECT_ROOT/generated/libversion/config.h"
+cp "$TMPDIR/libversion/export.h" "$PROJECT_ROOT/generated/libversion/export.h"
+
+echo "Generated headers updated in generated/libversion/"