Merge pull request #6 from aeternity/tb-fix-win32

Fix win32 nif compilation
This commit is contained in:
Tino Breddin 2019-08-20 15:04:02 +02:00 committed by GitHub
commit 1bb5263bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 10 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ Cargo.lock
/parity-ethereum /parity-ethereum
/_build /_build
/ebin /ebin
/priv/ecrecover.dll
/priv/ecrecover.so

View File

@ -1,22 +1,31 @@
UNAME := $(shell uname) UNAME := $(shell uname)
ifeq ($(OS),Windows_NT)
nif_lib_src = ecrecover.dll
nif_lib = ecrecover.dll
else
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
artefact = libecrecover.so nif_lib_src = libecrecover.so
nif_lib = ecrecover.so
endif endif
ifeq ($(UNAME), Darwin) ifeq ($(UNAME), Darwin)
artefact = libecrecover.dylib nif_lib_src = libecrecover.dylib
nif_lib = ecrecover.so
endif
endif endif
all: priv/$(nif_lib) compile
all: priv/ecrecover.so compile:
./rebar3 compile
priv/ecrecover.so: src/lib.rs parity-ethereum/ priv/$(nif_lib): src/lib.rs parity-ethereum/
cargo build --release cargo build --release
cp target/release/$(artefact) priv/ecrecover.so cp target/release/$(nif_lib_src) $@
clean: clean:
rm -f priv/ecrecover.so target/release/$(artefact) rm -f priv/$(nif_lib) target/release/$(nif_lib_src)
./rebar3 clean
parity-ethereum/: parity-ethereum/:
git clone https://github.com/johnsnewby/parity-ethereum.git git clone https://github.com/aeternity/parity-ethereum.git

View File

@ -3,7 +3,7 @@
{ecrecoverprebuilt, {ecrecoverprebuilt,
{ecrecoverprebuilt_app_with_priv_from_git, {ecrecoverprebuilt_app_with_priv_from_git,
{git, "https://github.com/aeternity/ecrecover-prebuilt.git", {git, "https://github.com/aeternity/ecrecover-prebuilt.git",
{ref, "fc52b89"}}}} {ref, "274f90b"}}}}
]}. ]}.
{plugins, [{rebar_ecrecoverprebuilt_dep, {plugins, [{rebar_ecrecoverprebuilt_dep,

View File

@ -1,5 +1,5 @@
[{<<"ecrecoverprebuilt">>, [{<<"ecrecoverprebuilt">>,
{ecrecoverprebuilt_app_with_priv_from_git, {ecrecoverprebuilt_app_with_priv_from_git,
{git,"https://github.com/aeternity/ecrecover-prebuilt.git", {git,"https://github.com/aeternity/ecrecover-prebuilt.git",
{ref,"fc52b89643073be5ab65b192e466933d903994d7"}}}, {ref,"274f90ba3d93468e8eec405309b43b6c97ae4246"}}},
0}]. 0}].

BIN
rebar3 Normal file

Binary file not shown.