cxx-qt-build: store manifest and dependencies in Interface for now

This allows export() to have no args meaning we can return an Interface
from the compile command next.

Author: ahayzen-kdab

crates/cxx-qt-build/src/dependencies.rs

@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 
 use std::path::PathBuf;
 
-#[derive(Clone, Serialize, Deserialize)]
+#[derive(Clone, Default, Serialize, Deserialize)]
 /// This struct is used by cxx-qt-build internally to propagate data through to downstream
 /// dependencies
 pub(crate) struct Manifest {

crates/cxx-qt-build/src/interface.rs

@@ -18,6 +18,8 @@ pub struct Interface {
     pub(crate) reexport_links: HashSet<String>,
     pub(crate) exported_include_prefixes: Vec<String>,
     pub(crate) exported_include_directories: Vec<(PathBuf, String)>,
+    pub(crate) manifest: Manifest,
+    pub(crate) dependencies: Vec<Dependency>,
     // TODO: In future, we want to also set up the include paths so that you can include anything
     // from the crates source directory.
     // Once this is done, this flag should indicate whether or not to export our own crates source
@@ -31,6 +33,8 @@ impl Default for Interface {
             reexport_links: HashSet::new(),
             exported_include_prefixes: vec![super::crate_name()],
             exported_include_directories: Vec::new(),
+            manifest: Manifest::default(),
+            dependencies: Vec::new(),
         }
     }
 }
@@ -100,20 +104,20 @@ impl Interface {
         self
     }
 
-    pub(crate) fn export(self, mut manifest: Manifest, dependencies: &[Dependency]) {
+    pub(crate) fn export(mut self) {
         self.write_exported_include_directories();
 
         // We automatically reexport all qt_modules and downstream dependencies
         // as they will always need to be enabled in the final binary.
         // However, we only reexport the headers of libraries that
         // are marked as re-export.
-        let dependencies = reexported_dependencies(&self, &dependencies);
+        let dependencies = reexported_dependencies(&self, &self.dependencies);
 
-        manifest.exported_include_prefixes = all_include_prefixes(&self, &dependencies);
+        self.manifest.exported_include_prefixes = all_include_prefixes(&self, &dependencies);
 
         let manifest_path = dir::crate_target().join("manifest.json");
-        let manifest_json =
-            serde_json::to_string_pretty(&manifest).expect("Failed to convert Manifest to JSON!");
+        let manifest_json = serde_json::to_string_pretty(&self.manifest)
+            .expect("Failed to convert Manifest to JSON!");
         std::fs::write(&manifest_path, manifest_json).expect("Failed to write manifest.json!");
         println!(
             "cargo::metadata=CXX_QT_MANIFEST_PATH={}",

crates/cxx-qt-build/src/lib.rs

@@ -1125,16 +1125,17 @@ extern "C" bool {init_fun}() {{
             self.cc_builder.compile(&static_lib_name());
         }
 
-        if let Some(interface) = self.public_interface {
-            let manifest = Manifest {
+        if let Some(mut interface) = self.public_interface {
+            interface.manifest = Manifest {
                 name: crate_name(),
                 link_name: link_name()
                     .expect("The links key must be set when creating a library with CXX-Qt-build!"),
                 initializers: vec![public_initializer.strip_file()],
                 qt_modules: qt_modules.into_iter().collect(),
                 exported_include_prefixes: vec![],
             };
-            interface.export(manifest, &dependencies);
+            interface.dependencies = dependencies;
+            interface.export();
         }
     }
 }