refactor: move add_pkg_config to arch

Author: hoolioh

builder/src/arch/apple.rs

@@ -1,6 +1,7 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::Result;
 use std::ffi::OsStr;
 use std::process::Command;
 
@@ -32,3 +33,7 @@ pub fn strip_libraries(lib_path: &str) {
 }
 
 pub fn add_additional_files(_lib_path: &str, _target_path: &OsStr) {}
+
+pub fn add_pkg_config(crate_path: &str, target_path: &str, version: &str) -> Result<()> {
+    super::generate_pkg_config(crate_path, target_path, version, NATIVE_LIBS)
+}

builder/src/arch/linux.rs

@@ -1,6 +1,7 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::Result;
 use std::ffi::OsStr;
 use std::process::Command;
 
@@ -56,3 +57,7 @@ pub fn strip_libraries(lib_path: &str) {
 }
 
 pub fn add_additional_files(_lib_path: &str, _target_path: &OsStr) {}
+
+pub fn add_pkg_config(crate_path: &str, target_path: &str, version: &str) -> Result<()> {
+    super::generate_pkg_config(crate_path, target_path, version, NATIVE_LIBS)
+}

builder/src/arch/mod.rs

@@ -1,6 +1,56 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::Result;
+use std::ffi::OsStr;
+use std::fs;
+use std::path::{Path, PathBuf};
+
+use crate::utils::{file_replace, project_root};
+
+pub fn generate_pkg_config(
+    crate_path: &str,
+    target_path: &str,
+    version: &str,
+    native_libs: &str,
+) -> Result<()> {
+    let files: [&str; 3] = [
+        "datadog_profiling.pc",
+        "datadog_profiling_with_rpath.pc",
+        "datadog_profiling-static.pc",
+    ];
+
+    let pc_dir = Path::new(target_path);
+    fs::create_dir_all(pc_dir).expect("Failed to create pkgconfig directory");
+
+    for file in files.iter() {
+        let file_in = file.to_string() + ".in";
+
+        let mut pc_origin: PathBuf = project_root();
+        pc_origin.push(crate_path);
+        pc_origin.push(file_in);
+
+        let pc_target: PathBuf = [pc_dir.as_os_str(), OsStr::new(file)].iter().collect();
+
+        file_replace(
+            pc_origin.to_str().unwrap(),
+            pc_target.to_str().unwrap(),
+            "@Datadog_VERSION@",
+            version,
+        )?;
+
+        if *file == files[2] {
+            file_replace(
+                pc_origin.to_str().unwrap(),
+                pc_target.to_str().unwrap(),
+                "@Datadog_LIBRARIES@",
+                native_libs,
+            )?;
+        }
+    }
+    Ok(())
+}
+
 #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
 #[cfg(all(target_os = "linux", target_env = "gnu"))]
 mod linux;

builder/src/arch/musl.rs

@@ -1,6 +1,7 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::Result;
 use std::ffi::OsStr;
 use std::process::Command;
 
@@ -56,3 +57,7 @@ pub fn strip_libraries(lib_path: &str) {
 }
 
 pub fn add_additional_files(_lib_path: &str, _target_path: &OsStr) {}
+
+pub fn add_pkg_config(crate_path: &str, target_path: &str, version: &str) -> Result<()> {
+    super::generate_pkg_config(crate_path, target_path, version, NATIVE_LIBS)
+}

builder/src/arch/windows.rs

@@ -1,6 +1,7 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
+use anyhow::Result;
 use std::ffi::OsStr;
 use std::fs;
 use std::path::PathBuf;
@@ -29,6 +30,12 @@ pub fn add_additional_files(lib_path: &str, target_path: &OsStr) {
     fs::copy(from_pdb, to_pdb).expect("unable to copy pdb file");
 
     let from_imp: PathBuf = [lib_path, PROF_DLL_IMPORT_LIB_FFI].iter().collect();
-    let to_imp: PathBuf = [target_path, OsStr::new(PROF_DLL_IMPORT_LIB_FFI)].iter().collect();
+    let to_imp: PathBuf = [target_path, OsStr::new(PROF_DLL_IMPORT_LIB_FFI)]
+        .iter()
+        .collect();
     fs::copy(from_imp, to_imp).expect("unable to copy dll import lib");
 }
+
+pub fn add_pkg_config(_crate_path: &str, _target_path: &str, _version: &str) -> Result<()> {
+    Ok(())
+}

builder/src/profiling.rs

@@ -3,7 +3,7 @@
 
 use crate::arch;
 use crate::module::Module;
-use crate::utils::{adjust_extern_symbols, file_replace, project_root, wait_for_success};
+use crate::utils::{adjust_extern_symbols, project_root, wait_for_success};
 use anyhow::Result;
 use serde::Deserialize;
 use std::ffi::OsStr;
@@ -118,46 +118,11 @@ impl Profiling {
     }
 
     fn add_pkg_config(&self) -> Result<()> {
-        #[cfg(target_os = "windows")]
-        return Ok(());
-
-        let files: [&str; 3] = [
-            "datadog_profiling.pc",
-            "datadog_profiling_with_rpath.pc",
-            "datadog_profiling-static.pc",
-        ];
-
-        //Create directory
-        let pc_dir = Path::new(self.target_pkconfig.as_ref());
-        fs::create_dir_all(pc_dir).expect("Failed to create pkgconfig directory");
-
-        // Create files
-        for file in files.iter() {
-            let file_in = file.to_string() + ".in";
-
-            let mut pc_origin: PathBuf = project_root();
-            pc_origin.push(CRATE_FOLDER);
-            pc_origin.push(file_in);
-
-            let pc_target: PathBuf = [pc_dir.as_os_str(), OsStr::new(file)].iter().collect();
-
-            file_replace(
-                pc_origin.to_str().unwrap(),
-                pc_target.to_str().unwrap(),
-                "@Datadog_VERSION@",
-                &self.version,
-            )?;
-
-            if *file == files[2] {
-                file_replace(
-                    pc_origin.to_str().unwrap(),
-                    pc_target.to_str().unwrap(),
-                    "@Datadog_LIBRARIES@",
-                    arch::NATIVE_LIBS,
-                )?;
-            }
-        }
-        Ok(())
+        arch::add_pkg_config(
+            CRATE_FOLDER,
+            self.target_pkconfig.as_ref(),
+            self.version.as_ref(),
+        )
     }
 }