fix cxxbridge code generation

Author: conradoplg

build.rs

@@ -64,16 +64,19 @@ fn bindgen_headers() -> Result<()> {
 /// (This is in contrast to zcash which generates in `depend/zcash/src/rust/gen/`)
 fn gen_cxxbridge() -> Result<()> {
     let out_path = env::var("OUT_DIR").map_err(Error::Env)?;
-    let out_path = PathBuf::from(out_path).join("include");
+    let out_path = PathBuf::from(out_path).join("gen");
+    let src_out_path = PathBuf::from(&out_path).join("src");
+    let header_out_path = PathBuf::from(&out_path).join("include").join("rust");
 
     // These must match `CXXBRIDGE_RS` in depend/zcash/src/Makefile.am
     let filenames = ["blake2b", "ed25519", "equihash", "streams", "bridge"];
 
     // The output folder must exist
-    fs::create_dir_all(out_path.join("rust")).unwrap();
+    fs::create_dir_all(&src_out_path).unwrap();
+    fs::create_dir_all(&header_out_path).unwrap();
 
     // Generate the generic header file
-    fs::write(out_path.join("rust/cxx.h"), cxx_gen::HEADER).unwrap();
+    fs::write(header_out_path.join("cxx.h"), cxx_gen::HEADER).unwrap();
 
     // Generate the source and header for each bridge file
     for filename in filenames {
@@ -100,9 +103,13 @@ fn gen_cxxbridge() -> Result<()> {
             )
         });
 
-        fs::write(out_path.join(format!("rust/{}.h", filename)), output.header).unwrap();
         fs::write(
-            out_path.join(format!("rust/{}.c", filename)),
+            header_out_path.join(format!("{}.h", filename)),
+            output.header,
+        )
+        .unwrap();
+        fs::write(
+            src_out_path.join(format!("{}.c", filename)),
             output.implementation,
         )
         .unwrap();
@@ -114,8 +121,8 @@ fn main() -> Result<()> {
     bindgen_headers()?;
     gen_cxxbridge()?;
 
-    let include_path = env::var("OUT_DIR").map_err(Error::Env)?;
-    let include_path = PathBuf::from(include_path).join("include");
+    let gen_path = env::var("OUT_DIR").map_err(Error::Env)?;
+    let gen_path = PathBuf::from(gen_path).join("gen");
 
     let target = env::var("TARGET").expect("TARGET was not set");
     let mut base_config = cc::Build::new();
@@ -126,7 +133,7 @@ fn main() -> Result<()> {
         .include("depend/zcash/src/")
         .include("depend/zcash/src/rust/include/")
         .include("depend/zcash/src/secp256k1/include/")
-        .include(&include_path)
+        .include(&gen_path.join("include"))
         .flag_if_supported("-Wno-implicit-fallthrough")
         .flag_if_supported("-Wno-catch-value")
         .flag_if_supported("-Wno-reorder")
@@ -155,6 +162,7 @@ fn main() -> Result<()> {
         .file("depend/zcash/src/uint256.cpp")
         .file("depend/zcash/src/pubkey.cpp")
         .file("depend/zcash/src/hash.cpp")
+        .file("depend/zcash/src/streams_rust.cpp")
         .file("depend/zcash/src/primitives/transaction.cpp")
         .file("depend/zcash/src/crypto/ripemd160.cpp")
         .file("depend/zcash/src/crypto/sha1.cpp")
@@ -165,7 +173,11 @@ fn main() -> Result<()> {
         .file("depend/zcash/src/script/script.cpp")
         .file("depend/zcash/src/script/script_error.cpp")
         .file("depend/zcash/src/support/cleanse.cpp")
-        .file(include_path.join("rust/blake2b.c"))
+        // A subset of the files generated by gen_cxxbridge
+        // which are required by zcash_script.
+        .file(gen_path.join("src/blake2b.c"))
+        .file(gen_path.join("src/bridge.c"))
+        .file(gen_path.join("src/streams.c"))
         .compile("libzcash_script.a");
 
     Ok(())