Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub const FAST_PATH_EXTENSIONS: &[&str] = &[
/// should not invalidate a warm build.
pub const FAST_PATH_EXCLUDES: &[&str] = &[
".cache",
".fbuild",
fbuild_paths::FBUILD_DIR_NAME,
".git",
".pio",
".venv",
Expand Down
2 changes: 1 addition & 1 deletion crates/fbuild-build-engine/src/compiler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ fn object_hash_key(source: &Path, build_dir: &Path) -> String {
for ancestor in build_dir.ancestors() {
if ancestor
.file_name()
.map(|n| n == ".fbuild")
.map(|n| n == fbuild_paths::FBUILD_DIR_NAME)
.unwrap_or(false)
{
if let Some(workspace) = ancestor.parent() {
Expand Down
10 changes: 8 additions & 2 deletions crates/fbuild-build-engine/src/framework_libs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,13 @@ fn collect_header_basenames(roots: &[PathBuf]) -> HashSet<String> {
.to_lowercase();
if matches!(
name.as_str(),
".git" | ".pio" | ".fbuild" | ".zap" | ".build" | "build" | "target"
".git"
| ".pio"
| fbuild_paths::FBUILD_DIR_NAME
| ".zap"
| ".build"
| "build"
| "target"
) {
continue;
}
Expand Down Expand Up @@ -530,7 +536,7 @@ fn should_scan_entry(entry: &DirEntry) -> bool {
name.as_str(),
".git"
| ".pio"
| ".fbuild"
| fbuild_paths::FBUILD_DIR_NAME
| ".zap"
| ".build"
| "build"
Expand Down
2 changes: 1 addition & 1 deletion crates/fbuild-build-engine/src/source_scanner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const EXCLUDE_DIRS: &[&str] = &[
".git",
"__pycache__",
"node_modules",
".fbuild",
fbuild_paths::FBUILD_DIR_NAME,
".venv",
"venv",
".cache",
Expand Down
7 changes: 6 additions & 1 deletion crates/fbuild-build-engine/src/symbol_analyzer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,12 @@ pub fn discover_elf_in_project(project_dir: &Path) -> Option<PathBuf> {
}
}
// 2. .fbuild and 3. .pio output trees
for relative in [".fbuild/build", ".pio/build"] {
let fbuild_tree = format!(
"{}/{}",
fbuild_paths::FBUILD_DIR_NAME,
fbuild_paths::BUILD_DIR_NAME
);
for relative in [fbuild_tree.as_str(), ".pio/build"] {
let root = project_dir.join(relative);
if root.exists() {
if let Some(elf) = newest_elf_under(&root) {
Expand Down
2 changes: 1 addition & 1 deletion dylints/ban_raw_fbuild_path/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "ban_raw_fbuild_path"
# Bump the version to bust the dylint .so cache when allowlist.txt
# changes (setup-soldr's dylint-cache key hashes the manifest but not
# src/allowlist.txt). Same convention ban_manual_slash_normalize follows.
version = "0.1.3"
version = "0.1.4"
description = "Ban raw '.fbuild' path literals outside fbuild-paths"
edition = "2021"
publish = false
Expand Down
5 changes: 0 additions & 5 deletions dylints/ban_raw_fbuild_path/src/allowlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,11 @@ crates/fbuild-core/src/path.rs
# Each line below is a file that spells `.fbuild` by hand today. Removing
# a line is the unit of progress on #1349; adding one is not allowed.

crates/fbuild-build-engine/src/build_fingerprint/fast_path.rs
crates/fbuild-build-engine/src/build_info.rs
crates/fbuild-build-engine/src/compile_database/tests/clang.rs
crates/fbuild-build-engine/src/compile_database/tests/generate.rs
crates/fbuild-build-engine/src/compiler.rs
crates/fbuild-build-engine/src/compiler_tests.rs
crates/fbuild-build-engine/src/framework_libs.rs
crates/fbuild-build-engine/src/linker.rs
crates/fbuild-build-engine/src/source_scanner.rs
crates/fbuild-build-engine/src/symbol_analyzer/mod.rs
crates/fbuild-build/src/compile_many.rs
crates/fbuild-build/tests/avr_build.rs
crates/fbuild-build/tests/clangd_check_parity.rs
Expand Down
Loading