Added support for integrating the package_version information in a co…

…mment of the header file. The new command line argument for this is --package-version. The TOML config file flag is package_version=true||false. Closes #926 Co-Authored-By: Emilio Cobos Álvarez <emilio@crisal.io>
mozilla · Apr 14, 2024 · af46999 · af46999
1 parent 400f437
commit af46999
Show file tree

Hide file tree

Showing 22 changed files with 236 additions and 7 deletions.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly"
diff --git a/src/bindgen/bindings.rs b/src/bindgen/bindings.rs
@@ -33,6 +33,7 @@ pub struct Bindings {
     /// Bindings are generated by a recursive call to cbindgen
     /// and shouldn't do anything when written anywhere.
     noop: bool,
+    package_version: String,
 }
 
 #[derive(PartialEq, Eq)]
@@ -53,6 +54,7 @@ impl Bindings {
         functions: Vec<Function>,
         source_files: Vec<path::PathBuf>,
         noop: bool,
+        package_version: String,
     ) -> Bindings {
         Bindings {
             config,
@@ -65,6 +67,7 @@ impl Bindings {
             functions,
             source_files,
             noop,
+            package_version,
         }
     }
 
@@ -209,6 +212,20 @@ impl Bindings {
             return;
         }
 
+        if self.config.package_version {
+            out.new_line_if_not_start();
+            match self.config.language {
+                Language::C | Language::Cxx => {
+                    write!(out, "/* Package version: {} */", self.package_version);
+                }
+                Language::Cython => {
+                    write!(out, "''' Package version: {} '''", self.package_version);
+                }
+            }
+
+            out.new_line();
+        }
+
         if let Some(ref f) = self.config.header {
             out.new_line_if_not_start();
             write!(out, "{}", f);
@@ -228,11 +245,23 @@ impl Bindings {
         }
         if self.config.include_version {
             out.new_line_if_not_start();
-            write!(
-                out,
-                "/* Generated with cbindgen:{} */",
-                crate::bindgen::config::VERSION
-            );
+            match self.config.language {
+                Language::C | Language::Cxx => {
+                    write!(
+                        out,
+                        "/* Generated with cbindgen:{} */",
+                        crate::bindgen::config::VERSION
+                    );
+                }
+                Language::Cython => {
+                    write!(
+                        out,
+                        "''' Generated with cbindgen:{} '''",
+                        crate::bindgen::config::VERSION
+                    );
+                }
+            }
+
             out.new_line();
         }
         if let Some(ref f) = self.config.autogen_warning {

diff --git a/src/bindgen/builder.rs b/src/bindgen/builder.rs
@@ -361,6 +361,7 @@ impl Builder {
                 Default::default(),
                 Default::default(),
                 true,
+                String::new(),
             ));
         }
 
@@ -405,6 +406,7 @@ impl Builder {
             result.typedefs,
             result.functions,
             result.source_files,
+            result.package_version,
         )
         .generate()
     }

diff --git a/src/bindgen/config.rs b/src/bindgen/config.rs
@@ -919,6 +919,8 @@ pub struct Config {
     /// This option is useful when using cbindgen with tools such as python's cffi which
     /// doesn't understand include directives
     pub no_includes: bool,
+    // Package version: True if the package version should appear as a comment in the .h file
+    pub package_version: bool,
     /// Optional text to output at major sections to deter manual editing
     pub autogen_warning: Option<String>,
     /// Include a comment with the version of cbindgen used to generate the file
@@ -1040,6 +1042,7 @@ impl Default for Config {
             autogen_warning: None,
             include_version: false,
             no_includes: false,
+            package_version: false,
             namespace: None,
             namespaces: None,
             using_namespaces: None,

diff --git a/src/bindgen/ir/constant.rs b/src/bindgen/ir/constant.rs
@@ -7,7 +7,7 @@ use std::collections::HashMap;
 use std::io::Write;
 
 use syn::ext::IdentExt;
-use syn::{self, UnOp};
+use syn::UnOp;
 
 use crate::bindgen::config::{Config, Language};
 use crate::bindgen::declarationtyperesolver::DeclarationTypeResolver;

diff --git a/src/bindgen/library.rs b/src/bindgen/library.rs
@@ -27,6 +27,7 @@ pub struct Library {
     typedefs: ItemMap<Typedef>,
     functions: Vec<Function>,
     source_files: Vec<PathBuf>,
+    package_version: String,
 }
 
 impl Library {
@@ -42,6 +43,7 @@ impl Library {
         typedefs: ItemMap<Typedef>,
         functions: Vec<Function>,
         source_files: Vec<PathBuf>,
+        package_version: String,
     ) -> Library {
         Library {
             config,
@@ -54,6 +56,7 @@ impl Library {
             typedefs,
             functions,
             source_files,
+            package_version,
         }
     }
 
@@ -141,6 +144,7 @@ impl Library {
             functions,
             self.source_files,
             false,
+            self.package_version,
         ))
     }
 

diff --git a/src/bindgen/parser.rs b/src/bindgen/parser.rs
@@ -81,6 +81,13 @@ pub(crate) fn parse_lib(lib: Cargo, config: &Config) -> ParseResult {
     let binding_crate = context.lib.as_ref().unwrap().binding_crate_ref();
     context.parse_crate(&binding_crate)?;
     context.out.source_files = context.cache_src.keys().map(|k| k.to_owned()).collect();
+    context.out.package_version = context
+        .lib
+        .as_ref()
+        .unwrap()
+        .binding_crate_ref()
+        .version
+        .unwrap();
     Ok(context.out)
 }
 
@@ -409,6 +416,7 @@ pub struct Parse {
     pub typedefs: ItemMap<Typedef>,
     pub functions: Vec<Function>,
     pub source_files: Vec<FilePathBuf>,
+    pub package_version: String,
 }
 
 impl Parse {
@@ -423,6 +431,7 @@ impl Parse {
             typedefs: ItemMap::default(),
             functions: Vec::new(),
             source_files: Vec::new(),
+            package_version: String::new(),
         }
     }
 
@@ -471,6 +480,7 @@ impl Parse {
         self.typedefs.extend_with(&other.typedefs);
         self.functions.extend_from_slice(&other.functions);
         self.source_files.extend_from_slice(&other.source_files);
+        self.package_version = other.package_version.clone();
     }
 
     fn load_syn_crate_mod<'a>(

diff --git a/src/main.rs b/src/main.rs
@@ -49,6 +49,10 @@ fn apply_config_overrides(config: &mut Config, matches: &ArgMatches) {
         config.only_target_dependencies = true;
     }
 
+    if matches.get_flag("package-version") {
+        config.package_version = true;
+    }
+
     match matches.try_get_one::<String>("style") {
         Ok(Some(style)) => {
             config.style = bindgen::Style::from_str(style).unwrap();
@@ -163,6 +167,12 @@ fn main() {
                 .help("Specify the language to output bindings in")
                 .value_parser(["c++", "C++", "c", "C", "cython", "Cython"]),
         )
+        .arg(
+            Arg::new("package-version")
+                .long("package-version")
+                .action(ArgAction::SetTrue)
+                .help("Include the package version in the header comment")
+        )
         .arg(
             Arg::new("cpp-compat")
                 .long("cpp-compat")

diff --git a/tests/expectations/package_version.c b/tests/expectations/package_version.c
@@ -0,0 +1,12 @@
+/* Package version: 0.1.0 */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uint64_t bar;
+} Foo;
+
+void doit(const Foo*);
diff --git a/tests/expectations/package_version.compat.c b/tests/expectations/package_version.compat.c
@@ -0,0 +1,20 @@
+/* Package version: 0.1.0 */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uint64_t bar;
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void doit(const Foo*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff --git a/tests/expectations/package_version.cpp b/tests/expectations/package_version.cpp
@@ -0,0 +1,17 @@
+/* Package version: 0.1.0 */
+
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct Foo {
+  uint64_t bar;
+};
+
+extern "C" {
+
+void doit(const Foo*);
+
+} // extern "C"
diff --git a/tests/expectations/package_version.pyx b/tests/expectations/package_version.pyx
@@ -0,0 +1,14 @@
+''' Package version: 0.1.0 '''
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Foo:
+    uint64_t bar;
+
+  void doit(const Foo*);
diff --git a/tests/expectations/package_version_both.c b/tests/expectations/package_version_both.c
@@ -0,0 +1,12 @@
+/* Package version: 0.1.0 */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  uint64_t bar;
+} Foo;
+
+void doit(const struct Foo*);
diff --git a/tests/expectations/package_version_both.compat.c b/tests/expectations/package_version_both.compat.c
@@ -0,0 +1,20 @@
+/* Package version: 0.1.0 */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  uint64_t bar;
+} Foo;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void doit(const struct Foo*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff --git a/tests/expectations/package_version_tag.c b/tests/expectations/package_version_tag.c
@@ -0,0 +1,12 @@
+/* Package version: 0.1.0 */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  uint64_t bar;
+};
+
+void doit(const struct Foo*);
diff --git a/tests/expectations/package_version_tag.compat.c b/tests/expectations/package_version_tag.compat.c
@@ -0,0 +1,20 @@
+/* Package version: 0.1.0 */
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  uint64_t bar;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void doit(const struct Foo*);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff --git a/tests/expectations/package_version_tag.pyx b/tests/expectations/package_version_tag.pyx
@@ -0,0 +1,14 @@
+''' Package version: 0.1.0 '''
+
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Foo:
+    uint64_t bar;
+
+  void doit(const Foo*);
diff --git a/tests/rust/package_version/Cargo.lock b/tests/rust/package_version/Cargo.lock
diff --git a/tests/rust/package_version/Cargo.toml b/tests/rust/package_version/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "package_version"
+version = "0.1.0"
+authors = ["hitbear"]
+
+[features]
+cbindgen = []
diff --git a/tests/rust/package_version/cbindgen.toml b/tests/rust/package_version/cbindgen.toml
@@ -0,0 +1 @@
+package_version = true
diff --git a/tests/rust/package_version/src/lib.rs b/tests/rust/package_version/src/lib.rs
@@ -0,0 +1,7 @@
+#[repr(C)]
+pub struct Foo {
+    bar: u64,
+}
+
+#[no_mangle]
+pub extern "C" fn doit(_: &Foo) {}