Skip to content

Commit

Permalink
Update to Solidity 0.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
axic committed Jan 16, 2019
1 parent 41f5152 commit 8da25c0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ fn main() {
println!("cargo:rustc-link-search=native={}/lib", dst.display());
println!("cargo:rustc-link-search=native={}/build/libsolc", dst.display());
println!("cargo:rustc-link-search=native={}/build/libsolidity", dst.display());
println!("cargo:rustc-link-search=native={}/build/libyul", dst.display());
println!("cargo:rustc-link-search=native={}/build/liblangutil", dst.display());
println!("cargo:rustc-link-search=native={}/build/libevmasm", dst.display());
println!("cargo:rustc-link-search=native={}/build/libdevcore", dst.display());
println!("cargo:rustc-link-search=native={}/build/deps/lib", dst.display());
println!("cargo:rustc-link-lib=static=solc");
println!("cargo:rustc-link-lib=static=solidity");
println!("cargo:rustc-link-lib=static=yul");
println!("cargo:rustc-link-lib=static=langutil");
println!("cargo:rustc-link-lib=static=evmasm");
println!("cargo:rustc-link-lib=static=devcore");
println!("cargo:rustc-link-lib=static=jsoncpp");
Expand Down
2 changes: 1 addition & 1 deletion solidity
Submodule solidity updated 2360 files
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ use std::ffi::CStr;

pub fn version() -> String {
unsafe {
CStr::from_ptr(native::version()).to_string_lossy().into_owned()
CStr::from_ptr(native::solidity_version()).to_string_lossy().into_owned()
}
}

// FIXME support read callback
pub fn compile(input: String) -> String {
let input_cstr = CString::new(input).expect("input expected");
unsafe {
CStr::from_ptr(native::compileStandard(input_cstr.as_ptr() as *const i8, None)).to_string_lossy().into_owned()
CStr::from_ptr(native::solidity_compile(input_cstr.as_ptr() as *const i8, None)).to_string_lossy().into_owned()
}
}

Expand Down

0 comments on commit 8da25c0

Please sign in to comment.