Update mp4parse_capi for standard mozilla vendoring

- Remove build.rs in favor of executing cbindgen externally
- Remove cbindgen build dependency
- Add cbindgen.toml for generated bindings preferences

And corresponding changes to test_ffi:
- Generate mp4parse_capi header in build.rs
- Configure cbindgen via cbindgen.toml
- Put generated code in out OUT_DIR
- Include generated code indirectly, as mozilla tree does

See https://bugzilla.mozilla.org/show_bug.cgi?id=1624056

Author: baumanj

mp4parse_capi/Cargo.toml

@@ -34,9 +34,6 @@ num-traits = "0.2.0"
 [dev-dependencies]
 env_logger = "0.7.1"
 
-[build-dependencies]
-cbindgen = "0.5.2"
-
 [features]
 # Enable mp4parse_fallible to use fallible memory allocation rather than
 # panicking on OOM.  Note that this is only safe within Gecko where the system

mp4parse_capi/build.rs

@@ -0,0 +1,17 @@
+header = """/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */"""
+autogen_warning = """/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen. */
+#ifndef mp4parse_rust_mp4parse_h
+#error "Don't include this file directly, instead include mp4parse.h"
+#endif
+"""
+include_version = true
+braces = "SameLine"
+line_length = 100
+tab_width = 2
+language = "C"
+cpp_compat = true
+
+[enum]
+rename_variants = "QualifiedScreamingSnakeCase"

mp4parse_capi/cbindgen.toml

@@ -8,5 +8,6 @@ edition = "2018"
 mp4parse_capi = { path = "../mp4parse_capi" }
 
 [build-dependencies]
+cbindgen = "0.14.2"
 mp4parse_capi = { path = "../mp4parse_capi" }
 cc = "1.0"

test_ffi/Cargo.toml

@@ -1,14 +1,31 @@
+extern crate cbindgen;
 extern crate cc;
 
+use cbindgen::{Config, RenameRule};
+use std::path::Path;
+
+const CAPI_CRATE: &str = "../mp4parse_capi";
+
 fn main() {
+    println!("cargo:rerun-if-changed={}/src/lib.rs", CAPI_CRATE);
+
+    let crate_dir = Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap()).join(CAPI_CRATE);
+    let generated_include_dir = Path::new(&std::env::var("OUT_DIR").unwrap()).join("include");
+    let header_path = generated_include_dir.join("mp4parse_ffi_generated.h");
+
+    cbindgen::generate(&crate_dir)
+        .expect("Could not generate header")
+        .write_to_file(header_path);
+
     println!("cargo:rerun-if-changed=src/main.rs");
     println!("cargo:rerun-if-changed=src/test.cc");
 
     cc::Build::new()
         .file("src/test.cc")
         .cpp(true)
         .flag_if_supported("-std=c++11")
-        .include("../mp4parse_capi/include")
+        .include("include")
+        .include(generated_include_dir)
         .compile("libtest.a");
 
     #[cfg(unix)]

test_ffi/build.rs

@@ -0,0 +1,12 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#ifndef mp4parse_rust_mp4parse_h
+#define mp4parse_rust_mp4parse_h
+
+#include "mp4parse_ffi_generated.h"
+
+// Add any non-generated support code here
+
+#endif