Skip to content

Commit d67852c

Browse files
committed
Move bitcoin submodule to tmp/bitcoin
We want to move over to using git subtrees instead of submodules however we would like to keep the current path `depend/bitcoin` for the subtree. In preparation for this add a new temporary submodule `tmp/bitcoin` and checkout the same commit as `depend/bitcoin` so that this commit builds cleanly. Remove the subtree at `depend/bitocin`. Next we will create a subtree at `depend/bitcoin`.
1 parent b00bd50 commit d67852c

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[submodule "depend/bitcoin"]
2-
path = depend/bitcoin
1+
[submodule "tmp/bitcoin"]
2+
path = tmp/bitcoin
33
url = https://github.com/bitcoin/bitcoin.git
44
branch = 0.19

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repository = "https://github.com/rust-bitcoin/rust-bitcoinconsensus/"
99
description = "Bitcoin's libbitcoinconsensus with Rust binding."
1010
keywords = [ "bitcoin", "bitcoinconsensus", "libbitcoinconsensus" ]
1111
readme = "README.md"
12-
exclude = ["/depend/bitcoin/.github/**", "/depend/bitcoin/.tx/**", "/depend/bitcoin/build-aux/**", "/depend/bitcoin/contrib/**", "/depend/bitcoin/depends/**", "/depend/bitcoin/doc/**", "/depend/bitcoin/share/**", "/depend/bitcoin/test/**", "/depend/bitcoin/src/bench/**", "/depend/bitcoin/src/config/**", "/depend/bitcoin/src/consensus/**", "/depend/bitcoin/src/leveldb/**", "/depend/bitcoin/src/policy/**", "/depend/bitcoin/src/qt/**", "/depend/bitcoin/src/rpc/**", "/depend/bitcoin/src/support/**", "/depend/bitcoin/src/test/**", "/depend/bitcoin/src/univalue/**", "/depend/bitcoin/src/wallet/**", "/depend/bitcoin/src/zmq/**"]
12+
exclude = ["/tmp/bitcoin/.github/**", "/tmp/bitcoin/.tx/**", "/tmp/bitcoin/build-aux/**", "/tmp/bitcoin/contrib/**", "/tmp/bitcoin/tmps/**", "/tmp/bitcoin/doc/**", "/tmp/bitcoin/share/**", "/tmp/bitcoin/test/**", "/tmp/bitcoin/src/bench/**", "/tmp/bitcoin/src/config/**", "/tmp/bitcoin/src/consensus/**", "/tmp/bitcoin/src/leveldb/**", "/tmp/bitcoin/src/policy/**", "/tmp/bitcoin/src/qt/**", "/tmp/bitcoin/src/rpc/**", "/tmp/bitcoin/src/support/**", "/tmp/bitcoin/src/test/**", "/tmp/bitcoin/src/univalue/**", "/tmp/bitcoin/src/wallet/**", "/tmp/bitcoin/src/zmq/**"]
1313
build = "build.rs"
1414
edition = "2018"
1515

build.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ fn main() {
2222
let mut base_config = cc::Build::new();
2323
base_config
2424
.cpp(true)
25-
.include("depend/bitcoin/src")
26-
.include("depend/bitcoin/src/secp256k1/include")
25+
.include("tmp/bitcoin/src")
26+
.include("tmp/bitcoin/src/secp256k1/include")
2727
.define("__STDC_FORMAT_MACROS", None);
2828

2929
// **Secp256k1**
3030
if !cfg!(feature = "external-secp") {
3131
base_config
32-
.include("depend/bitcoin/src/secp256k1")
32+
.include("tmp/bitcoin/src/secp256k1")
3333
.flag_if_supported("-Wno-unused-function") // some ecmult stuff is defined but not used upstream
3434
.define("SECP256K1_BUILD", "1")
3535
// Bitcoin core defines libsecp to *not* use libgmp.
@@ -39,7 +39,7 @@ fn main() {
3939
// Technically libconsensus doesn't require the recovery feautre, but `pubkey.cpp` does.
4040
.define("ENABLE_MODULE_RECOVERY", "1")
4141
// The actual libsecp256k1 C code.
42-
.file("depend/bitcoin/src/secp256k1/src/secp256k1.c");
42+
.file("tmp/bitcoin/src/secp256k1/src/secp256k1.c");
4343

4444
if is_big_endian {
4545
base_config.define("WORDS_BIGENDIAN", "1");
@@ -68,19 +68,19 @@ fn main() {
6868
base_config.define("WIN32", "1");
6969
}
7070
base_config
71-
.file("depend/bitcoin/src/util/strencodings.cpp")
72-
.file("depend/bitcoin/src/uint256.cpp")
73-
.file("depend/bitcoin/src/pubkey.cpp")
74-
.file("depend/bitcoin/src/hash.cpp")
75-
.file("depend/bitcoin/src/primitives/transaction.cpp")
76-
.file("depend/bitcoin/src/crypto/ripemd160.cpp")
77-
.file("depend/bitcoin/src/crypto/sha1.cpp")
78-
.file("depend/bitcoin/src/crypto/sha256.cpp")
79-
.file("depend/bitcoin/src/crypto/sha512.cpp")
80-
.file("depend/bitcoin/src/crypto/hmac_sha512.cpp")
81-
.file("depend/bitcoin/src/script/bitcoinconsensus.cpp")
82-
.file("depend/bitcoin/src/script/interpreter.cpp")
83-
.file("depend/bitcoin/src/script/script.cpp")
84-
.file("depend/bitcoin/src/script/script_error.cpp")
71+
.file("tmp/bitcoin/src/util/strencodings.cpp")
72+
.file("tmp/bitcoin/src/uint256.cpp")
73+
.file("tmp/bitcoin/src/pubkey.cpp")
74+
.file("tmp/bitcoin/src/hash.cpp")
75+
.file("tmp/bitcoin/src/primitives/transaction.cpp")
76+
.file("tmp/bitcoin/src/crypto/ripemd160.cpp")
77+
.file("tmp/bitcoin/src/crypto/sha1.cpp")
78+
.file("tmp/bitcoin/src/crypto/sha256.cpp")
79+
.file("tmp/bitcoin/src/crypto/sha512.cpp")
80+
.file("tmp/bitcoin/src/crypto/hmac_sha512.cpp")
81+
.file("tmp/bitcoin/src/script/bitcoinconsensus.cpp")
82+
.file("tmp/bitcoin/src/script/interpreter.cpp")
83+
.file("tmp/bitcoin/src/script/script.cpp")
84+
.file("tmp/bitcoin/src/script/script_error.cpp")
8585
.compile("libbitcoinconsensus.a");
8686
}

0 commit comments

Comments
 (0)