proper build (#3)

jesterpm · Mar 7, 2020 · 49e3b7a · 49e3b7a
1 parent 05ecd4d
commit 49e3b7a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/build_4_8.rs b/build_4_8.rs
@@ -6,7 +6,18 @@ use std::process::Command;
 pub const SOURCE_DIR: &'static str = "db-4.8.30";
 
 pub fn build_unix(out_dir: &str) {
-    let build_dir = Path::new(SOURCE_DIR).join("build_unix");
+    let copy_dir = Path::new(out_dir).join(SOURCE_DIR);
+    let build_dir = copy_dir.join("build_unix");
+
+    // copy source to out_dir
+    Command::new("cp")
+        .arg("-r")
+        .arg(Path::new(SOURCE_DIR).to_str().unwrap())
+        .arg(copy_dir.to_str().unwrap())
+        .status()
+        .unwrap();
+
+    // build
     Command::new("../dist/configure")
         .arg(&format!("--prefix={}", out_dir))
         .arg("--with-gnu-ld")
@@ -28,8 +39,9 @@ pub fn build_unix(out_dir: &str) {
 }
 
 pub fn generate_bindings(out_dir: &str) {
+    let build_dir = Path::new(out_dir).join(SOURCE_DIR).join("build_unix");
     let bindings = bindgen::Builder::default()
-        .header("db-4.8.30/build_unix/db.h")
+        .header(build_dir.join("db.h").to_str().unwrap())
         .derive_copy(true)
         .derive_debug(true)
         .derive_default(true)

diff --git a/build_5_3.rs b/build_5_3.rs
@@ -6,7 +6,18 @@ use std::process::Command;
 pub const SOURCE_DIR: &'static str = "db-5.3.21";
 
 pub fn build_unix(out_dir: &str) {
-    let build_dir = Path::new(SOURCE_DIR).join("build_unix");
+    let copy_dir = Path::new(out_dir).join(SOURCE_DIR);
+    let build_dir = copy_dir.join("build_unix");
+
+    // copy source to out_dir
+    Command::new("cp")
+        .arg("-r")
+        .arg(Path::new(SOURCE_DIR).to_str().unwrap())
+        .arg(copy_dir.to_str().unwrap())
+        .status()
+        .unwrap();
+
+    // build
     Command::new("../dist/configure")
         .arg(&format!("--prefix={}", out_dir))
         .arg("--with-gnu-ld")
@@ -28,8 +39,9 @@ pub fn build_unix(out_dir: &str) {
 }
 
 pub fn generate_bindings(out_dir: &str) {
+    let build_dir = Path::new(out_dir).join(SOURCE_DIR).join("build_unix");
     let bindings = bindgen::Builder::default()
-        .header("db-5.3.21/build_unix/db.h")
+        .header(build_dir.join("db.h").to_str().unwrap())
         .derive_copy(true)
         .derive_debug(true)
         .derive_default(true)