alex/nih-plug
1
0
Fork 0
Code Activity

Remove files before reflinking in xtask bundle

Browse source 
Otherwise the reflink will fail, and apparently the fallback copy also
doesn't always work correctly on macOS.

This fixes #26.
This commit is contained in:
Robbert van der Helm 2022-09-02 14:25:57 +02:00
parent a7bc90050e
commit 5faed9e2e7
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nih_plug_xtask/src/lib.rs
View file

@ -9,6 +9,7 @@ use std::process::Command;
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
mod symbols; mod symbols;
mod util;
/// Re-export for the main function. /// Re-export for the main function.
pub use anyhow::Result; pub use anyhow::Result;
@ -255,7 +256,7 @@ fn bundle_binary(
fs::create_dir_all(standalone_binary_path.parent().unwrap()) fs::create_dir_all(standalone_binary_path.parent().unwrap())
.context("Could not create standalone bundle directory")?; .context("Could not create standalone bundle directory")?;
reflink::reflink_or_copy(&bin_path, &standalone_binary_path) util::reflink(&bin_path, &standalone_binary_path)
.context("Could not copy binary to standalone bundle")?; .context("Could not copy binary to standalone bundle")?;
// FIXME: The reflink crate seems to sometime strip away the executable bit, so we need to help // FIXME: The reflink crate seems to sometime strip away the executable bit, so we need to help
@ -325,7 +326,7 @@ fn bundle_plugin(
fs::create_dir_all(clap_lib_path.parent().unwrap()) fs::create_dir_all(clap_lib_path.parent().unwrap())
.context("Could not create CLAP bundle directory")?; .context("Could not create CLAP bundle directory")?;
reflink::reflink_or_copy(&lib_path, &clap_lib_path) util::reflink(&lib_path, &clap_lib_path)
.context("Could not copy library to CLAP bundle")?; .context("Could not copy library to CLAP bundle")?;
// In contrast to VST3, CLAP only uses bundles on macOS, so we'll just take the first // In contrast to VST3, CLAP only uses bundles on macOS, so we'll just take the first
@ -352,7 +353,7 @@ fn bundle_plugin(
fs::create_dir_all(vst2_lib_path.parent().unwrap()) fs::create_dir_all(vst2_lib_path.parent().unwrap())
.context("Could not create VST2 bundle directory")?; .context("Could not create VST2 bundle directory")?;
reflink::reflink_or_copy(&lib_path, &vst2_lib_path) util::reflink(&lib_path, &vst2_lib_path)
.context("Could not copy library to VST2 bundle")?; .context("Could not copy library to VST2 bundle")?;
// VST2 only uses bundles on macOS, so we'll just take the first component of the library // VST2 only uses bundles on macOS, so we'll just take the first component of the library
@ -379,7 +380,7 @@ fn bundle_plugin(
fs::create_dir_all(vst3_lib_path.parent().unwrap()) fs::create_dir_all(vst3_lib_path.parent().unwrap())
.context("Could not create VST3 bundle directory")?; .context("Could not create VST3 bundle directory")?;
reflink::reflink_or_copy(&lib_path, &vst3_lib_path) util::reflink(&lib_path, &vst3_lib_path)
.context("Could not copy library to VST3 bundle")?; .context("Could not copy library to VST3 bundle")?;
let vst3_bundle_home = vst3_lib_path let vst3_bundle_home = vst3_lib_path

15
nih_plug_xtask/src/util.rs Normal file
View file

@ -0,0 +1,15 @@
use anyhow::{Context, Result};
use std::fs;
use std::path::Path;
/// Acts the same as [`reflink::reflink_or_copy()`], but it removes existing files first. This works
/// around a limitation of macOS that the reflink crate also applies to other platforms to stay
/// consistent. See the [`reflink`] crate documentation or #26 for more information.
pub fn reflink<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> Result<Option<u64>> {
let to = to.as_ref();
if to.exists() {
fs::remove_file(to).context("Could not remove file before reflinking")?;
}
reflink::reflink_or_copy(from, to).context("Could not reflink or copy file")
}