Put build results in book dir

simon-bourne · Nov 30, 2023 · f471d12 · f471d12
1 parent 0d9d2c2
commit f471d12
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/examples/book/.gitignore b/examples/book/.gitignore
@@ -0,0 +1 @@
+/book/
diff --git a/packages/rust-book/src/lib.rs b/packages/rust-book/src/lib.rs
@@ -55,6 +55,7 @@ struct Book {
     src_dir: PathBuf,
     out_dir: PathBuf,
     out_src_dir: PathBuf,
+    book_out_dir: PathBuf,
 }
 
 impl Book {
@@ -68,25 +69,26 @@ impl Book {
             src_dir: [&cargo_manifest_dir, "src"].into_iter().collect(),
             out_dir: out_dir.clone(),
             out_src_dir: out_dir.join("src"),
+            book_out_dir: [&cargo_manifest_dir, "book"].into_iter().collect(),
         })
     }
 
     fn build(&self) -> Result<()> {
         // TODO: Figure out why build fails sometimes when we remove the output dir:
         // fs::remove_dir_all(&self.out_dir)?;
         fs::create_dir_all(&self.out_dir)?;
-        fs::copy(
-            self.cargo_manifest_dir.join("book.toml"),
-            self.out_dir.join("book.toml"),
-        )?;
+        let mdbook_config_file = self.cargo_manifest_dir.join("book.toml");
+        fs::copy(&mdbook_config_file, self.out_dir.join("book.toml"))?;
         fs::create_dir_all(&self.out_src_dir)?;
         fs::copy(
             self.src_dir.join("SUMMARY.md"),
             self.out_src_dir.join("SUMMARY.md"),
         )?;
         self.build_modules(&[])?;
 
-        MDBook::load(&self.out_dir)?.build()?;
+        let mut config = mdbook::Config::from_disk(mdbook_config_file)?;
+        config.build.build_dir = self.book_out_dir.clone();
+        MDBook::load_with_config(&self.out_dir, config)?.build()?;
         println!("Built rust book to '{:?}'", &self.out_dir);
 
         Ok(())