Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put LiveKitBridge Swift build directory in target

Browse source 
Helps it get caught in a cargo clean
This commit is contained in:
Julia 2023-07-28 18:53:24 -04:00
parent 4626981b25
commit fe43bacb6f
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/live_kit_client/build.rs
View file

@ -58,11 +58,14 @@ fn build_bridge(swift_target: &SwiftTarget) {
"cargo:rerun-if-changed={}/Package.resolved", "cargo:rerun-if-changed={}/Package.resolved",
SWIFT_PACKAGE_NAME SWIFT_PACKAGE_NAME
); );
let swift_package_root = swift_package_root(); let swift_package_root = swift_package_root();
let swift_target_folder = swift_target_folder();
if !Command::new("swift") if !Command::new("swift")
.arg("build") .arg("build")
.args(["--configuration", &env::var("PROFILE").unwrap()]) .args(["--configuration", &env::var("PROFILE").unwrap()])
.args(["--triple", &swift_target.target.triple]) .args(["--triple", &swift_target.target.triple])
.args(["--build-path".into(), swift_target_folder])
.current_dir(&swift_package_root) .current_dir(&swift_package_root)
.status() .status()
.unwrap() .unwrap()
@ -128,6 +131,12 @@ fn swift_package_root() -> PathBuf {
env::current_dir().unwrap().join(SWIFT_PACKAGE_NAME) env::current_dir().unwrap().join(SWIFT_PACKAGE_NAME)
} }
fn swift_target_folder() -> PathBuf {
env::current_dir()
.unwrap()
.join(format!("../../target/{SWIFT_PACKAGE_NAME}"))
}
fn copy_dir(source: &Path, destination: &Path) { fn copy_dir(source: &Path, destination: &Path) {
assert!( assert!(
Command::new("rm") Command::new("rm")
@ -155,8 +164,7 @@ fn copy_dir(source: &Path, destination: &Path) {
impl SwiftTarget { impl SwiftTarget {
fn out_dir_path(&self) -> PathBuf { fn out_dir_path(&self) -> PathBuf {
swift_package_root() swift_target_folder()
.join(".build")
.join(&self.target.unversioned_triple) .join(&self.target.unversioned_triple)
.join(env::var("PROFILE").unwrap()) .join(env::var("PROFILE").unwrap())
} }