Skip to content
Merged
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
14 changes: 7 additions & 7 deletions crates/build/src/generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ impl ArtifactsGenerator {
fs::create_dir_all(parent)?;
}

let source_entry = Self::process_content(source, validated_deps)?;
let source_entry = Self::process_content(source, base_dir, validated_deps)?;
fs::write(&mirrored_path, &source_entry.content)?;

let relative_path_str = relative_path.display().to_string();
Expand All @@ -152,15 +152,15 @@ impl ArtifactsGenerator {
}

/// Reads and processes the content of a `.simf` file.
fn process_content(source: &Path, validated_deps: &ValidatedDeps) -> Result<SourceEntry, BuildError> {
let parent_dir = source.parent().ok_or_else(|| {
BuildError::GenerationFailed(format!("Path '{}' has no parent directory", source.display()))
})?;

fn process_content(
source: &Path,
project_root: &Path,
validated_deps: &ValidatedDeps,
) -> Result<SourceEntry, BuildError> {
let canon_source = CanonPath::canonicalize(source).map_err(BuildError::PathCanonicalization)?;
let content = fs::read_to_string(source)?;
let canon_source_file = CanonSourceFile::new(canon_source, Arc::from(content));
let dependency_map = Self::build_dependency_map(validated_deps, parent_dir)?;
let dependency_map = Self::build_dependency_map(validated_deps, project_root)?;

let template = TemplateProgram::new_with_dep(
canon_source_file.clone(),
Expand Down
Loading