Skip to content

Commit

Permalink
clean up Makefile, remove set-taget, and add comment
Browse files Browse the repository at this point in the history
 about building locally (in Readme) and
 remove ipfs dependency from ll-core module
 (this will be part of #152 instead)
  • Loading branch information
liamsi committed Feb 16, 2021
1 parent 3308e76 commit 77c2377
Show file tree
Hide file tree
Showing 7 changed files with 157 additions and 1,086 deletions.
12 changes: 2 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ require (
github.com/go-logfmt/logfmt v0.5.0
github.com/gogo/protobuf v1.3.1
github.com/golang/protobuf v1.4.3
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
github.com/gorilla/websocket v1.4.2
github.com/gtank/merlin v0.1.1
github.com/hdevalence/ed25519consensus v0.0.0-20201207055737-7fde80a9d5ff
github.com/ipfs/go-ipfs v0.7.0
github.com/ipfs/go-ipfs-config v0.9.0
github.com/ipfs/interface-go-ipfs-core v0.4.0
github.com/lazyledger/lazyledger-core/p2p/ipld/plugin v0.0.0-00010101000000-000000000000
// TODO(ismail): update to tagged version after
// https://github.com/lazyledger/nmt/pull/19 gets merged
github.com/lazyledger/nmt v0.1.1-0.20210213205848-6cb03eeda173
Expand All @@ -33,6 +30,7 @@ require (
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
github.com/rs/cors v1.7.0
github.com/sasha-s/go-deadlock v0.2.0
github.com/smartystreets/assertions v1.0.1 // indirect
github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
github.com/spf13/cobra v1.1.1
github.com/spf13/viper v1.7.1
Expand All @@ -45,9 +43,3 @@ require (
google.golang.org/grpc v1.33.2
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
)

replace (
github.com/ipfs/go-ipfs v0.7.0 => github.com/lazyledger/go-ipfs v0.7.1-0.20210205233505-656642674e11
github.com/ipfs/go-verifcid => github.com/lazyledger/go-verifcid v0.0.2-0.20210205232850-c3e21cfe4064
github.com/lazyledger/lazyledger-core/p2p/ipld/plugin => ./p2p/ipld/plugin
)
917 changes: 0 additions & 917 deletions go.sum

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions p2p/ipld/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@

Usually, a simple `make install` should build and install the plugin locally.

If you want to compile against a locally checked out version of IPFS, run:

```sh
cd plugin
./set-target.sh REPLACE_WITH_YOUR_LOCAL_PATH/go-ipfs
make install
```
If you want to compile against a locally checked out version of IPFS, change the `replace` directive in go.mo.

Running ipfs (e.g. `ipfs init` or `ipfs daemon`) loads the plugin automatically.

Expand Down
5 changes: 0 additions & 5 deletions p2p/ipld/plugin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ endif

.PHONY: install build

go.mod: FORCE
#./set-target.sh github.com/lazyledger/go-ipfs@v0.7.1-0.20210202000024-02a5a799f618

FORCE:

lazyledger-plugin.so: plugin.go go.mod
$(GOCC) build $(GOFLAGS) -buildmode=plugin -o "$@" "$<"
chmod +x "$@"
Expand Down
7 changes: 5 additions & 2 deletions p2p/ipld/plugin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ require (
)

replace (
github.com/ipfs/go-ipfs v0.7.0 => github.com/lazyledger/go-ipfs v0.7.1-0.20210213193504-c65604ccb2ed
github.com/ipfs/go-verifcid => github.com/lazyledger/go-verifcid v0.0.2-0.20210213182512-19890b0d114d
// If you encounter:
// plugin was built with a different version of package X
// overwrite below line with a local directory with the corresponding version of go-ipfs checked out
github.com/ipfs/go-ipfs => github.com/lazyledger/go-ipfs v0.7.0-lazypatch
github.com/ipfs/go-verifcid => github.com/lazyledger/go-verifcid v0.0.1-lazypatch
)
259 changes: 149 additions & 110 deletions p2p/ipld/plugin/go.sum

Large diffs are not rendered by default.

35 changes: 0 additions & 35 deletions p2p/ipld/plugin/set-target.sh

This file was deleted.

0 comments on commit 77c2377

Please sign in to comment.