[WIP] Fix broken build cfgs by conditional crates

solana-labs · Feb 3, 2020 · b3b65b0 · b3b65b0
1 parent e1c763a
commit b3b65b0
Show file tree

Hide file tree

Showing 14 changed files with 434 additions and 329 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
diff --git a/programs/vote/Cargo.toml b/programs/vote/Cargo.toml
@@ -19,7 +19,7 @@ serde_derive = "1.0.103"
 solana-logger = { path = "../../logger", version = "0.24.0" }
 solana-metrics = { path = "../../metrics", version = "0.24.0" }
 solana-sdk = { path = "../../sdk", version = "0.24.0" }
-solana-sdk-macro = { path = "../../sdk/macro", version = "0.24.0" }
+solana-sdk-macro-frozen-abi = { path = "../../sdk/macro-frozen-abi", version = "0.24.0" }
 thiserror = "1.0"
 
 [build-dependencies]

diff --git a/programs/vote/src/lib.rs b/programs/vote/src/lib.rs
@@ -11,4 +11,4 @@ solana_sdk::declare_program!(
 );
 
 #[macro_use]
-extern crate solana_sdk_macro;
+extern crate solana_sdk_macro_frozen_abi;
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -29,7 +29,7 @@ solana-measure = { path = "../measure", version = "0.24.0" }
 solana-metrics = { path = "../metrics", version = "0.24.0" }
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "0.24.0" }
 solana-sdk = { path = "../sdk", version = "0.24.0" }
-solana-sdk-macro = { path = "../sdk/macro", version = "0.24.0" }
+solana-sdk-macro-frozen-abi = { path = "../sdk/macro-frozen-abi", version = "0.24.0" }
 solana-stake-program = { path = "../programs/stake", version = "0.24.0" }
 solana-storage-program = { path = "../programs/storage", version = "0.24.0" }
 solana-vote-program = { path = "../programs/vote", version = "0.24.0" }

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -38,7 +38,7 @@ extern crate solana_bpf_loader_program;
 extern crate serde_derive;
 
 #[macro_use]
-extern crate solana_sdk_macro;
+extern crate solana_sdk_macro_frozen_abi;
 
 extern crate fs_extra;
 extern crate tempfile;
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -23,7 +23,6 @@ default = [
     "ed25519-dalek",
     "solana-logger",
     "solana-crate-features",
-    "solana-sdk-macro"
 ]
 
 [dependencies]
@@ -52,7 +51,9 @@ thiserror = "1.0"
 ed25519-dalek = { version = "=1.0.0-pre.1", optional = true }
 solana-crate-features = { path = "../crate-features", version = "0.24.0", optional = true }
 solana-logger = { path = "../logger", version = "0.24.0", optional = true }
-solana-sdk-macro = { path = "macro", version = "0.24.0", optional = true }
+solana-sdk-macro = { path = "macro", version = "0.24.0" }
+solana-sdk-macro-frozen-abi = { path = "macro-frozen-abi", version = "0.24.0" }
+solana-sdk-macro-frozen-abi-dummy = { path = "macro-frozen-abi-dummy", version = "0.24.0" }
 
 [dev-dependencies]
 tiny-bip39 = "0.7.0"

diff --git a/sdk/macro-frozen-abi-dummy/Cargo.toml b/sdk/macro-frozen-abi-dummy/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "solana-sdk-macro-frozen-abi-dummy"
+version = "0.24.0"
+description = "Solana SDK Macro frozen abi"
+authors = ["Solana Maintainers <[email protected]>"]
+repository = "https://github.com/solana-labs/solana"
+homepage = "https://solana.com/"
+license = "Apache-2.0"
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+bs58 = "0.3.0"
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "1.0", features = ["full", "extra-traits"] }
diff --git a/sdk/macro-frozen-abi-dummy/src/lib.rs b/sdk/macro-frozen-abi-dummy/src/lib.rs
@@ -0,0 +1,8 @@
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+
+#[proc_macro_attribute]
+pub fn frozen_abi(_attrs: TokenStream, item: TokenStream) -> TokenStream {
+    item
+}
diff --git a/sdk/macro-frozen-abi/Cargo.toml b/sdk/macro-frozen-abi/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "solana-sdk-macro-frozen-abi"
+version = "0.24.0"
+description = "Solana SDK Macro frozen abi"
+authors = ["Solana Maintainers <[email protected]>"]
+repository = "https://github.com/solana-labs/solana"
+homepage = "https://solana.com/"
+license = "Apache-2.0"
+edition = "2018"
+build = "../build.rs"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+bs58 = "0.3.0"
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "1.0", features = ["full", "extra-traits"] }
+
+[build-dependencies]
+rustc_version = "0.2"