Update the installation settings for use by other packages #14

Merged
pitmutt merged 4 commits from rav001 into dev040 2024-02-25 22:17:52 +00:00
3 changed files with 4 additions and 35 deletions

View file

@ -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 <https://www.gnu.org/licenses/>.
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

View file

@ -17,7 +17,10 @@ A Haskell library to interact with the Zcash blockchain.
``` ```
./configure ./configure
``` ```
- Compile the Rust and Haskell portions: `make` - Compile the Rust and Haskell portions:
```
cabal build
```
## Use ## Use

View file

@ -93,10 +93,7 @@ rsAddDirs lbi' = do
updateLibBi libBuild = updateLibBi libBuild =
libBuild libBuild
{ includeDirs = rustIncludeDir : includeDirs libBuild { includeDirs = rustIncludeDir : includeDirs libBuild
, extraLibs = "rustzcash_wrapper" : extraLibs libBuild
, extraLibDirs = rustLibDir : extraLibDirs libBuild , extraLibDirs = rustLibDir : extraLibDirs libBuild
, extraBundledLibs = "rustzcash_wrapper" : extraBundledLibs libBuild
, ldOptions = ("-L" ++ localData) : ldOptions libBuild
} }
copyDir rustLibDir localData copyDir rustLibDir localData
pure $ updateLbi lbi' pure $ updateLbi lbi'