logos-messaging/logos-messaging-rust-bindings
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-rust-bindings.git synced 2026-01-08 17:03:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build errors when publishing

Browse Source
This commit is contained in:
Daniel Sanchez Quiros 2022-11-28 16:29:23 +01:00
parent b59bf33933
commit 969200abcf
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -570,9 +570,9 @@ dependencies = [
[[package]] [[package]]
name = "multiaddr" name = "multiaddr"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b8d2f5ee4645ab2c09b846006f3bb0916e728a0384982544dba553be727d772" checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"byteorder", "byteorder",
@ -1212,7 +1212,7 @@ dependencies = [
[[package]] [[package]]
name = "waku-sys" name = "waku-sys"
version = "0.1.0" version = "0.1.0-beta1"
dependencies = [ dependencies = [
"bindgen", "bindgen",
] ]

4
waku-bindings/Cargo.toml
View File

@ -16,7 +16,7 @@ categories = ["network-programming"]
aes-gcm = { version = "0.10", features = ["aes"] } aes-gcm = { version = "0.10", features = ["aes"] }
base64 = "0.13" base64 = "0.13"
hex = "0.4" hex = "0.4"
multiaddr = "0.15" multiaddr = "0.16"
once_cell = "1.15" once_cell = "1.15"
rand = "0.8" rand = "0.8"
secp256k1 = { version = "0.24", features = ["rand", "recovery", "serde"] } secp256k1 = { version = "0.24", features = ["rand", "recovery", "serde"] }
@ -24,4 +24,4 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
sscanf = "0.3" sscanf = "0.3"
url = "2.3" url = "2.3"
waku-sys = "0.1" waku-sys = { version = "0.1.0-beta1", path = "../waku-sys" }

2
waku-sys/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "waku-sys" name = "waku-sys"
version = "0.1.0" version = "0.1.0-beta1"
edition = "2021" edition = "2021"
authors = [ authors = [
"Daniel Sanchez Quiros <danielsq@status.im>" "Daniel Sanchez Quiros <danielsq@status.im>"

11
waku-sys/build.rs
View File

@ -31,6 +31,7 @@ fn build_go_waku_lib(go_bin: &str, project_dir: &Path) {
// Build go-waku static lib // Build go-waku static lib
// build command taken from waku make file: // build command taken from waku make file:
// https://github.com/status-im/go-waku/blob/eafbc4c01f94f3096c3201fb1e44f17f907b3068/Makefile#L115 // https://github.com/status-im/go-waku/blob/eafbc4c01f94f3096c3201fb1e44f17f907b3068/Makefile#L115
let out_dir: PathBuf = env::var_os("OUT_DIR").unwrap().into();
let vendor_path = project_dir.join("vendor"); let vendor_path = project_dir.join("vendor");
set_current_dir(vendor_path).expect("Moving to vendor dir"); set_current_dir(vendor_path).expect("Moving to vendor dir");
Command::new(go_bin) Command::new(go_bin)
@ -38,7 +39,7 @@ fn build_go_waku_lib(go_bin: &str, project_dir: &Path) {
.arg("build") .arg("build")
.arg("-buildmode=c-archive") .arg("-buildmode=c-archive")
.arg("-o") .arg("-o")
.arg("./build/lib/libgowaku.a") .arg(out_dir.join("libgowaku.a"))
.arg("./library") .arg("./library")
.status() .status()
.map_err(|e| println!("cargo:warning=go build failed due to: {}", e)) .map_err(|e| println!("cargo:warning=go build failed due to: {}", e))
@ -46,8 +47,10 @@ fn build_go_waku_lib(go_bin: &str, project_dir: &Path) {
set_current_dir(project_dir).expect("Going back to project dir"); set_current_dir(project_dir).expect("Going back to project dir");
} }
fn generate_bindgen_code(project_dir: &Path) { fn generate_bindgen_code() {
let lib_dir = project_dir.join("vendor/build/lib"); let lib_dir: PathBuf = env::var_os("OUT_DIR").unwrap().into();
// let lib_dir = project_dir.join("vendor/build/lib");
println!("cargo:rustc-link-search={}", lib_dir.display()); println!("cargo:rustc-link-search={}", lib_dir.display());
println!("cargo:rustc-link-lib=static=gowaku"); println!("cargo:rustc-link-lib=static=gowaku");
@ -79,5 +82,5 @@ fn main() {
let project_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()); let project_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
build_go_waku_lib(&go_bin, &project_dir); build_go_waku_lib(&go_bin, &project_dir);
generate_bindgen_code(&project_dir); generate_bindgen_code();
} }