From 26b21e882b92b4a810086f763a16927f854c1fab Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Sun, 25 Feb 2024 16:10:52 -0600 Subject: [PATCH 1/3] Remove Makefile --- Makefile | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 8bb5f0c..0000000 --- a/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2022-2024 Vergara Technologies LLC -# -# This file is part of Zcash-Haskell. -# -# Zcash-Haskell is free software: you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) any -# later version. -# -# Zcash-Haskell is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. - -# You should have received a copy of the GNU Lesser General Public License along with -# Zcash-Haskell. If not, see . - -rustlib := librustzcash-wrapper/target/x86_64-unknown-linux-gnu/debug - -.PHONY: all - -all: haskell - -test: test/Spec.hs haskell - stack test - -haskell: src/ZcashHaskell/Orchard.hs src/ZcashHaskell/Sapling.hs src/ZcashHaskell/Types.hs src/ZcashHaskell/Utils.hs src/C/Zcash.chs package.yaml stack.yaml $(rustlib)/rustzcash_wrapper.h $(rustlib)/librustzcash_wrapper.a $(rustlib)/librustzcash_wrapper.so $(rustlib)/rustzcash_wrapper-uninstalled.pc - stack build - -$(rustlib)/rustzcash_wrapper.h: librustzcash-wrapper/src/lib.rs librustzcash-wrapper/Cargo.toml - cd librustzcash-wrapper && cargo +nightly-2024-02-04 cbuild From 6b870d91f8a96805febbc9e5d9392468e509a64e Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Sun, 25 Feb 2024 16:11:10 -0600 Subject: [PATCH 2/3] Correct needed libraries --- Setup.hs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Setup.hs b/Setup.hs index 5efaca2..81a2622 100644 --- a/Setup.hs +++ b/Setup.hs @@ -93,10 +93,7 @@ rsAddDirs lbi' = do updateLibBi libBuild = libBuild { includeDirs = rustIncludeDir : includeDirs libBuild - , extraLibs = "rustzcash_wrapper" : extraLibs libBuild , extraLibDirs = rustLibDir : extraLibDirs libBuild - , extraBundledLibs = "rustzcash_wrapper" : extraBundledLibs libBuild - , ldOptions = ("-L" ++ localData) : ldOptions libBuild } copyDir rustLibDir localData pure $ updateLbi lbi' From 6e11ae7779937c367731569f159f80a6180ebc38 Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Sun, 25 Feb 2024 16:14:04 -0600 Subject: [PATCH 3/3] Update install instructions --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ffa015..a6f7cc1 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,10 @@ A Haskell library to interact with the Zcash blockchain. ``` ./configure ``` -- Compile the Rust and Haskell portions: `make` +- Compile the Rust and Haskell portions: + ``` + cabal build + ``` ## Use