cxx-qt-build: consider the folders in rust path

Closes #855

Author: ahayzen-kdab

CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - File name is used for CXX bridges rather than module name to match upstream
 - `#[qobject]` attribute is now optional on types in `extern "RustQt"`
 - `#[qobject]` attribute is now required on types in `extern "C++Qt"`
+- Rust bridges which are in folders are now considered by `CxxQtBuilder`
 
 ### Fixed
 

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

@@ -61,7 +61,10 @@ struct GeneratedCpp {
 
 impl GeneratedCpp {
     /// Generate QObject and cxx header/source C++ file contents
-    pub fn new(rust_file_path: impl AsRef<Path>) -> Result<Self, Diagnostic> {
+    pub fn new(
+        rust_file_path: impl AsRef<Path>,
+        relative_path: impl AsRef<Path>,
+    ) -> Result<Self, Diagnostic> {
         let to_diagnostic = |err| Diagnostic::new(rust_file_path.as_ref().to_owned(), err);
 
         let rust_file_path = rust_file_path.as_ref();
@@ -91,15 +94,16 @@ impl GeneratedCpp {
                             rust_file_path.display());
                     }
 
-                    // Match upstream where they use the file name as the ident
-                    //
-                    // TODO: what happens if there are folders?
+                    // Match upstream where they use the file name and folders as the ident
                     //
                     // TODO: ideally CXX-Qt would also use the file name
                     // https://github.com/KDAB/cxx-qt/pull/200/commits/4861c92e66c3a022d3f0dedd9f8fd20db064b42b
-                    file_ident = rust_file_path
-                        .file_stem()
-                        .unwrap()
+                    //
+                    // We need the relative path here as we want the folders
+                    file_ident = relative_path
+                        .as_ref()
+                        // Remove the .rs extension
+                        .with_extension("")
                         .to_str()
                         .unwrap()
                         .to_owned();
@@ -210,6 +214,10 @@ impl GeneratedCpp {
             header_directory.display(),
             self.file_ident
         ));
+        if let Some(directory) = header_path.parent() {
+            std::fs::create_dir_all(directory)
+                .expect("Could not create directory to write cxx-qt generated header files");
+        }
         let mut header = File::create(header_path).expect("Could not create cxx header file");
         header
             .write_all(&self.cxx.header)
@@ -220,6 +228,10 @@ impl GeneratedCpp {
             cpp_directory.display(),
             self.file_ident
         ));
+        if let Some(directory) = cpp_path.parent() {
+            std::fs::create_dir_all(directory)
+                .expect("Could not create directory to write cxx-qt generated source files");
+        }
         let mut cpp = File::create(&cpp_path).expect("Could not create cxx source file");
         cpp.write_all(&self.cxx.implementation)
             .expect("Could not write cxx source file");
@@ -242,7 +254,7 @@ fn generate_cxxqt_cpp_files(
         let path = format!("{manifest_dir}/{}", rs_path.as_ref().display());
         println!("cargo:rerun-if-changed={path}");
 
-        let generated_code = match GeneratedCpp::new(&path) {
+        let generated_code = match GeneratedCpp::new(&path, rs_path) {
             Ok(v) => v,
             Err(diagnostic) => {
                 diagnostic.report();

crates/cxx-qt-gen/src/writer/cpp/header.rs

@@ -185,7 +185,7 @@ pub fn write_cpp_header(generated: &GeneratedCppBlocks) -> String {
         {includes}
 
         {forward_declare}
-        #include "cxx-qt-gen/{cxx_file_stem}.cxx.h"
+        #include "{cxx_file_stem}.cxx.h"
 
         {extern_cxx_qt}
         {qobjects}

crates/cxx-qt-gen/src/writer/cpp/source.rs

@@ -60,7 +60,7 @@ pub fn write_cpp_source(generated: &GeneratedCppBlocks) -> String {
         .join("\n");
 
     formatdoc! {r#"
-        #include "cxx-qt-gen/{cxx_file_stem}.cxxqt.h"
+        #include "{cxx_file_stem}.cxxqt.h"
 
         {extern_cxx_qt}
         {qobjects}

crates/cxx-qt-gen/test_outputs/inheritance.cpp

@@ -1,4 +1,4 @@
-#include "cxx-qt-gen/inheritance.cxxqt.h"
+#include "inheritance.cxxqt.h"
 
 QVariant
 MyObject::data(QModelIndex const& _index, ::std::int32_t _role) const

crates/cxx-qt-gen/test_outputs/inheritance.h

@@ -6,7 +6,7 @@
 
 class MyObject;
 
-#include "cxx-qt-gen/inheritance.cxx.h"
+#include "inheritance.cxx.h"
 
 class MyObject
   : public QAbstractItemModel

crates/cxx-qt-gen/test_outputs/invokables.cpp

@@ -1,4 +1,4 @@
-#include "cxx-qt-gen/ffi.cxxqt.h"
+#include "ffi.cxxqt.h"
 
 namespace cxx_qt::my_object {
 void

crates/cxx-qt-gen/test_outputs/invokables.h

@@ -10,7 +10,7 @@ using MyObjectCxxQtThread = ::rust::cxxqt1::CxxQtThread<MyObject>;
 
 } // namespace cxx_qt::my_object
 
-#include "cxx-qt-gen/ffi.cxx.h"
+#include "ffi.cxx.h"
 
 namespace cxx_qt::my_object {
 class MyObject

crates/cxx-qt-gen/test_outputs/passthrough_and_naming.cpp

@@ -1,4 +1,4 @@
-#include "cxx-qt-gen/multi_object.cxxqt.h"
+#include "multi_object.cxxqt.h"
 
 // Define namespace otherwise we hit a GCC bug
 // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480

crates/cxx-qt-gen/test_outputs/passthrough_and_naming.h

@@ -53,7 +53,7 @@ using ExternObjectCxxQtSignalHandlererrorOccurred =
     struct ExternObjectCxxQtSignalParamserrorOccurred*>;
 } // namespace mynamespace::rust::cxxqtgen1
 
-#include "cxx-qt-gen/multi_object.cxx.h"
+#include "multi_object.cxx.h"
 
 namespace rust::cxxqtgen1 {
 ::QMetaObject::Connection