qt-build-utils: have a command writable path method for tools

Author: ahayzen-kdab

crates/qt-build-utils/src/tool/moc.rs

@@ -6,7 +6,6 @@
 use crate::{QtInstallation, QtTool};
 
 use std::{
-    env,
     path::{Path, PathBuf},
     process::Command,
 };
@@ -73,10 +72,7 @@ impl QtToolMoc {
     pub fn compile(&self, input_file: impl AsRef<Path>, arguments: MocArguments) -> MocProducts {
         let input_path = input_file.as_ref();
         // Put all the moc files into one place, this can then be added to the include path
-        let moc_dir = PathBuf::from(format!(
-            "{}/qt-build-utils/moc",
-            env::var("OUT_DIR").unwrap()
-        ));
+        let moc_dir = QtTool::Moc.writable_path();
         std::fs::create_dir_all(&moc_dir).expect("Could not create moc dir");
         let output_path = moc_dir.join(format!(
             "moc_{}.cpp",

crates/qt-build-utils/src/tool/mod.rs

@@ -3,6 +3,8 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
+use std::{env, path::PathBuf};
+
 mod moc;
 pub use moc::{MocArguments, MocProducts, QtToolMoc};
 
@@ -33,4 +35,11 @@ impl QtTool {
             Self::QmlTypeRegistrar => "qmltyperegistrar",
         }
     }
+
+    /// Return a directory where files can be written by this tool
+    ///
+    /// Note the location might not exist yet
+    pub(crate) fn writable_path(&self) -> PathBuf {
+        PathBuf::from(env::var("OUT_DIR").expect("OUT_DIR was not set")).join(self.binary_name())
+    }
 }

crates/qt-build-utils/src/tool/rcc.rs

@@ -7,7 +7,6 @@ use crate::{Initializer, QtInstallation, QtTool};
 
 use semver::Version;
 use std::{
-    env,
     path::{Path, PathBuf},
     process::Command,
 };
@@ -41,10 +40,7 @@ impl QtToolRcc {
     /// application.
     pub fn compile(&self, input_file: impl AsRef<Path>) -> Initializer {
         let input_path = input_file.as_ref();
-        let output_folder = PathBuf::from(&format!(
-            "{}/qt-build-utils/qrc",
-            env::var("OUT_DIR").unwrap()
-        ));
+        let output_folder = QtTool::Rcc.writable_path();
         std::fs::create_dir_all(&output_folder).expect("Could not create qrc dir");
         let output_path = output_folder.join(format!(
             "{}.cpp",