Skip to content

Commit

Permalink
Merge pull request rust-lang#878 from shen390s/master
Browse files Browse the repository at this point in the history
Cleanup build directory before preprocessors run to keep files genera…
  • Loading branch information
Dylan-DPC committed Apr 25, 2019
2 parents 14d1737 + 55b9e2b commit e8d872c
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions src/book/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,19 @@ impl MDBook {
renderer.name().to_string(),
);

let name = renderer.name();
let build_dir = self.build_dir_for(name);
if build_dir.exists() {
debug!(
"Cleaning build dir for the \"{}\" renderer ({})",
name,
build_dir.display()
);

utils::fs::remove_dir_content(&build_dir)
.chain_err(|| "Unable to clear output directory")?;
}

for preprocessor in &self.preprocessors {
if preprocessor_should_run(&**preprocessor, renderer, &self.config) {
debug!("Running the {} preprocessor.", preprocessor.name());
Expand All @@ -183,16 +196,6 @@ impl MDBook {
fn render(&self, preprocessed_book: &Book, renderer: &Renderer) -> Result<()> {
let name = renderer.name();
let build_dir = self.build_dir_for(name);
if build_dir.exists() {
debug!(
"Cleaning build dir for the \"{}\" renderer ({})",
name,
build_dir.display()
);

utils::fs::remove_dir_content(&build_dir)
.chain_err(|| "Unable to clear output directory")?;
}

let render_context = RenderContext::new(
self.root.clone(),
Expand Down

0 comments on commit e8d872c

Please sign in to comment.