Skip to content

Commit

Permalink
Working patching MVP
Browse files Browse the repository at this point in the history 
Co-authored-by: Dan Johnson <[email protected]>
  • Loading branch information
@P1n3appl3 @ComputerDruid
P1n3appl3 and ComputerDruid committed Mar 28, 2023
1 parent bb20a72 commit a7560bd
Show file tree
Hide file tree
Showing 4 changed files with 172 additions and 61 deletions.
141 changes: 95 additions & 46 deletions crate_universe/src/context/crate_context.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ use crate::metadata::{
};
use crate::splicing::WorkspaceMetadata;
use crate::utils::sanitize_module_name;
use crate::utils::starlark::{Glob, SelectList, SelectMap, SelectStringDict, SelectStringList};
use crate::utils::starlark::{
Glob, GlobOrLabels, Label, SelectList, SelectMap, SelectStringDict, SelectStringList,
};

#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Clone)]
pub struct CrateDependency {
Expand Down Expand Up @@ -43,8 +45,12 @@ pub struct TargetAttributes {
/// The path to the crate's root source file, relative to the manifest.
pub crate_root: Option<String>,

/// A glob pattern of all source files required by the target
pub srcs: Glob,
/// A glob pattern of all source files required by the target or a label
/// pointing to a filegroup containing said glob (used for patching)
pub srcs: GlobOrLabels,

/// A label for overriding compile_data, used for patching
pub compile_data: Option<GlobOrLabels>,
}

#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Clone)]
Expand Down Expand Up @@ -667,42 +673,75 @@ impl CrateContext {
// Normalize the path so that it always renders the same regardless of platform
|root| root.to_string_lossy().replace('\\', "/"),
);
println!("{}", package.id);
if package.id.repr.contains("(path+file://") {
println!("");
println!("{crate_name} {kind} {:?}", &crate_root);
println!("src: {:?}", &target.src_path);
println!("pkg: {:?}", package_root);
println!("root: {:?}", &crate_root);
println!("workspace: {:?}", workspace.workspace_prefix);
let temp_components = std::env::temp_dir().components().count() + 1;
println!("temp dir components to drop: {temp_components}");
let real_root: PathBuf =
package_root.components().skip(temp_components).collect();
println!("ACTUAL FOR REAL ROOT: {}", real_root.to_string_lossy());
println!("");
}
let crate_root = crate_root.map(|r| {
if package.id.repr.contains("(path+file://") {
let temp_components = std::env::temp_dir().components().count() + 1;
package_root
.components()
.skip(temp_components)
.collect::<PathBuf>()
.join(r)
.to_string_lossy()
.to_string()
let mut srcs = Glob::new_rust_srcs().into();
let mut crate_root = crate_root;
let mut compile_data = None;
let local_patch = package.id.repr.contains("(path+file://");
let temp_components = std::env::temp_dir().components().count() + 1;
let real_root: PathBuf =
package_root.components().skip(temp_components).collect();
if local_patch && !real_root.as_os_str().is_empty() {
let root = real_root.display();
let package = if let Some(workspace) = &workspace.workspace_prefix {
format!("{workspace}/{}", root)
} else {
r
}
});
root.to_string()
};
println!("There's a patch crate at '//{package}'.");
println!("Make sure that the following is the contents of '//{package}/BUILD.bazel':");
println!("\n=================================================\n");
println!(
r#"
filegroup(
name = "crate_root",
srcs = ["{crate_root}"],
visibility = ["//{workspace}/vendor:__subpackages__"],
)
filegroup(
name = "srcs",
srcs = glob(["**/*.rs"]),
visibility = ["//{workspace}/vendor:__subpackages__"],
)
filegroup(
name = "compile_data",
srcs = glob(
include = ["**"],
exclude = [
"**/* *",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
),
visibility = ["//{workspace}/vendor:__subpackages__"],
)"#,
workspace = workspace.workspace_prefix.as_ref().unwrap(),
crate_root = crate_root.as_deref().unwrap_or_else(|| "src/lib.rs")
);
println!("\n=================================================\n");
srcs = GlobOrLabels::Labels(vec![Label {
repository: None,
package: Some(package.clone()),
target: "srcs".to_string(),
}]);
crate_root = Some(format!("//{package}:crate_root"));
compile_data = Some(GlobOrLabels::Labels(vec![Label {
repository: None,
package: Some(package.clone()),
target: "compile_data".to_string(),
}]));
}

// Conditionally check to see if the dependencies is a build-script target
if include_build_scripts && kind == "custom-build" {
return Some(Rule::BuildScript(TargetAttributes {
crate_name,
crate_root,
srcs: Glob::new_rust_srcs(),
srcs,
compile_data,
}));
}

Expand All @@ -711,7 +750,8 @@ impl CrateContext {
return Some(Rule::ProcMacro(TargetAttributes {
crate_name,
crate_root,
srcs: Glob::new_rust_srcs(),
srcs,
compile_data,
}));
}

Expand All @@ -720,7 +760,8 @@ impl CrateContext {
return Some(Rule::Library(TargetAttributes {
crate_name,
crate_root,
srcs: Glob::new_rust_srcs(),
srcs,
compile_data,
}));
}

Expand All @@ -734,7 +775,8 @@ impl CrateContext {
return Some(Rule::Binary(TargetAttributes {
crate_name: target.name.clone(),
crate_root,
srcs: Glob::new_rust_srcs(),
srcs,
compile_data,
}));
}

Expand Down Expand Up @@ -787,7 +829,8 @@ mod test {
BTreeSet::from([Rule::Library(TargetAttributes {
crate_name: "common".to_owned(),
crate_root: Some("lib.rs".to_owned()),
srcs: Glob::new_rust_srcs(),
srcs: Glob::new_rust_srcs().into(),
compile_data: None,
})]),
);
}
Expand Down Expand Up @@ -819,7 +862,7 @@ mod test {
let include_build_scripts = false;
let context = CrateContext::new(
crate_annotation,
&annotations.metadata.packages,
&annotations.metadata,
&annotations.lockfile.crates,
&pairred_extras,
&annotations.features,
Expand All @@ -834,12 +877,14 @@ mod test {
Rule::Library(TargetAttributes {
crate_name: "common".to_owned(),
crate_root: Some("lib.rs".to_owned()),
srcs: Glob::new_rust_srcs(),
srcs: Glob::new_rust_srcs().into(),
compile_data: None,
}),
Rule::Binary(TargetAttributes {
crate_name: "common-bin".to_owned(),
crate_root: Some("main.rs".to_owned()),
srcs: Glob::new_rust_srcs(),
srcs: Glob::new_rust_srcs().into(),
compile_data: None,
}),
]),
);
Expand Down Expand Up @@ -882,7 +927,7 @@ mod test {
let include_build_scripts = true;
let context = CrateContext::new(
crate_annotation,
&annotations.metadata.packages,
&annotations.metadata,
&annotations.lockfile.crates,
&annotations.pairred_extras,
&annotations.features,
Expand All @@ -898,12 +943,14 @@ mod test {
Rule::Library(TargetAttributes {
crate_name: "openssl_sys".to_owned(),
crate_root: Some("src/lib.rs".to_owned()),
srcs: Glob::new_rust_srcs(),
srcs: Glob::new_rust_srcs().into(),
compile_data: None,
}),
Rule::BuildScript(TargetAttributes {
crate_name: "build_script_main".to_owned(),
crate_root: Some("build/main.rs".to_owned()),
srcs: Glob::new_rust_srcs(),
srcs: Glob::new_rust_srcs().into(),
compile_data: None,
})
]),
);
Expand All @@ -927,7 +974,7 @@ mod test {
let include_build_scripts = false;
let context = CrateContext::new(
crate_annotation,
&annotations.metadata.packages,
&annotations.metadata,
&annotations.lockfile.crates,
&annotations.pairred_extras,
&annotations.features,
Expand All @@ -942,7 +989,8 @@ mod test {
BTreeSet::from([Rule::Library(TargetAttributes {
crate_name: "openssl_sys".to_owned(),
crate_root: Some("src/lib.rs".to_owned()),
srcs: Glob::new_rust_srcs(),
srcs: Glob::new_rust_srcs().into(),
compile_data: None,
})]),
);
}
Expand All @@ -962,7 +1010,7 @@ mod test {
let include_build_scripts = false;
let context = CrateContext::new(
crate_annotation,
&annotations.metadata.packages,
&annotations.metadata,
&annotations.lockfile.crates,
&annotations.pairred_extras,
&annotations.features,
Expand All @@ -977,7 +1025,8 @@ mod test {
BTreeSet::from([Rule::Library(TargetAttributes {
crate_name: "sysinfo".to_owned(),
crate_root: Some("src/lib.rs".to_owned()),
srcs: Glob::new_rust_srcs(),
srcs: Glob::new_rust_srcs().into(),
compile_data: None,
})]),
);
}
Expand Down
35 changes: 24 additions & 11 deletions crate_universe/src/rendering.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,17 @@ impl Renderer {
build_script_env: attrs
.map_or_else(SelectDict::default, |attrs| attrs.build_script_env.clone())
.remap_configurations(platforms),
compile_data: make_data(
platforms,
&empty_set,
attrs.map_or(&empty_list, |attrs| &attrs.compile_data),
),
compile_data: {
let mut data = make_data(
platforms,
&empty_set,
attrs.map_or(&empty_list, |attrs| &attrs.compile_data),
);
if let Some(cd) = &target.compile_data {
data.glob = cd.clone();
}
data
},
crate_features: SelectList::from(&krate.common_attrs.crate_features)
.map_configuration_names(|triple| {
render_platform_constraint_label(&self.config.platforms_template, &triple)
Expand Down Expand Up @@ -479,11 +485,17 @@ impl Renderer {
target: &TargetAttributes,
) -> Result<CommonAttrs> {
Ok(CommonAttrs {
compile_data: make_data(
platforms,
&krate.common_attrs.compile_data_glob,
&krate.common_attrs.compile_data,
),
compile_data: {
let mut data = make_data(
platforms,
&krate.common_attrs.compile_data_glob,
&krate.common_attrs.compile_data,
);
if let Some(cd) = &target.compile_data {
data.glob = cd.clone();
}
data
},
crate_features: SelectList::from(&krate.common_attrs.crate_features)
.map_configuration_names(|triple| {
render_platform_constraint_label(&self.config.platforms_template, &triple)
Expand Down Expand Up @@ -719,7 +731,8 @@ fn make_data(platforms: &Platforms, glob: &BTreeSet<String>, select: &SelectList
.iter()
.map(|&glob| glob.to_owned())
.collect(),
},
}
.into(),
select: select.clone().remap_configurations(platforms),
}
}
Expand Down
6 changes: 3 additions & 3 deletions crate_universe/src/utils/starlark.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ pub struct CargoBuildScript {
serialize_with = "SelectList::serialize_starlark"
)]
pub rustc_flags: SelectList<WithOriginalConfigurations<String>>,
pub srcs: Glob,
pub srcs: GlobOrLabels,
#[serde(skip_serializing_if = "Set::is_empty")]
pub tags: Set<String>,
#[serde(
Expand Down Expand Up @@ -232,14 +232,14 @@ pub struct CommonAttrs {
pub rustc_env_files: SelectList<WithOriginalConfigurations<String>>,
#[serde(skip_serializing_if = "Vec::is_empty")]
pub rustc_flags: Vec<String>,
pub srcs: Glob,
pub srcs: GlobOrLabels,
#[serde(skip_serializing_if = "Set::is_empty")]
pub tags: Set<String>,
pub version: String,
}

pub struct Data {
pub glob: Glob,
pub glob: GlobOrLabels,
pub select: SelectList<WithOriginalConfigurations<String>>,
}

Expand Down
Loading

0 comments on commit a7560bd

Please sign in to comment.