generate path with windows compatibility

Author: RCasatta

.github/workflows/test.yml

@@ -32,22 +32,23 @@ jobs:
       - uses: Swatinem/rust-cache@v1.2.0
         with:
           key: ${{ matrix.feature }}${{ matrix.os }}
-        if: ${{ matrix.os != 'macos-10.15' }} # issue with hard-links on mac
+        if: ${{ matrix.os != 'macos-11' }} # issue with hard-links on mac
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
           override: true
       #- run: echo "TEMPDIR_ROOT=/dev/shm" >> $GITHUB_ENV # conflicts with test `test_data_persistence`
-        if: ${{ matrix.os != 'macos-10.15' }}
+      #  if: ${{ matrix.os != 'macos-11' }}
       - uses: actions-rs/cargo@v1
         with:
           command: test
           args: --features ${{ matrix.feature }}
       - run: echo "BITCOIND_EXE=$(find ./target/debug -name bitcoind)" >> $GITHUB_ENV
+        if: ${{ matrix.os != 'windows-2019' }} 
       - uses: actions-rs/cargo@v1
         with:
           command: test
-        if: ${{ matrix.feature != '0_18_1' &&  matrix.feature != '0_18_0' && matrix.feature != '0_17_1' }} # would fail `test_multi_wallet`
+        if: ${{ matrix.feature != '0_18_1' &&  matrix.feature != '0_18_0' && matrix.feature != '0_17_1' && matrix.os != 'windows-2019' }} # would fail `test_multi_wallet`
 
 
   cosmetics:

build.rs

@@ -135,8 +135,10 @@ fn main() {
                 };
 
                 if outpath.file_name().map(|s| s.to_str()) == Some(Some("bitcoind.exe")) {
-                    bitcoin_exe_home.push(outpath);
-                    std::fs::create_dir_all(&bitcoin_exe_home).unwrap();
+                    for d in outpath.iter() {
+                        bitcoin_exe_home.push(d);
+                    }
+                    std::fs::create_dir_all(&bitcoin_exe_home.parent().unwrap()).unwrap();
                     println!("{:?}", bitcoin_exe_home);
                     let mut outfile = std::fs::File::create(&bitcoin_exe_home).unwrap();
                     io::copy(&mut file, &mut outfile).unwrap();

src/lib.rs

@@ -416,18 +416,19 @@ impl From<bitcoincore_rpc::Error> for Error {
 
 /// Provide the bitcoind executable path if a version feature has been specified
 pub fn downloaded_exe_path() -> Result<String, Error> {
-    let ext = if cfg!(target_os = "windows") {
-        ".exe"
-    } else {
-        ""
-    };
     if versions::HAS_FEATURE {
-        Ok(format!(
-            "{}/bitcoin/bitcoin-{}/bin/bitcoind{}",
-            env!("OUT_DIR"),
-            versions::VERSION,
-            ext
-        ))
+        let mut path: PathBuf = env!("OUT_DIR").into();
+        path.push("bitcoin");
+        path.push(format!("bitcoin-{}", versions::VERSION));
+        path.push("bin");
+
+        if cfg!(target_os = "windows") {
+            path.push("bitcoind.exe");
+        } else {
+            path.push("bitcoind");
+        }
+
+        Ok(format!("{}", path.display()))
     } else {
         Err(Error::NoFeature)
     }