Merge pull request #35 from filecoin-project/feat/sectorbuilder

Import sectorbuilder bindings

.gitignore

@@ -2,3 +2,4 @@ lotus
 **/*.h
 **/*.a
 **/*.pc
+build/.update-modules

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "lib/bls-signatures/bls-signatures"]
 	path = lib/bls-signatures/bls-signatures
 	url = https://github.com/filecoin-project/bls-signatures.git
+[submodule "lib/sectorbuilder"]
+	path = lib/sectorbuilder
+	url = https://github.com/filecoin-project/go-sectorbuilder.git

Makefile

@@ -1,13 +1,41 @@
 all: build
+.PHONY: all
 
-blssigs: lib/bls-signatures/include/libbls_signatures.h
+BUILD_DEPS:=lib/bls-signatures/include/libbls_signatures.h
+BUILD_DEPS+=lib/sectorbuilder/include/sector_builder_ffi.h
 
-lib/bls-signatures/include/libbls_signatures.h: lib/bls-signatures/bls-signatures ;
+# git modules that need to be loaded
+MODULES:=
+
+lib/bls-signatures/include/libbls_signatures.h: lib/bls-signatures/bls-signatures
 	./scripts/install-bls-signatures.sh
+	@touch $@
 
-deps: blssigs
+MODULES+=lib/bls-signatures/bls-signatures
 
-build: deps
+
+lib/sectorbuilder/include/sector_builder_ffi.h: lib/sectorbuilder lib/sectorbuilder/rust-fil-sector-builder
+	./lib/sectorbuilder/build.sh
+	@touch $@
+
+MODULES+=lib/sectorbuilder
+MODULES+=lib/sectorbuilder/rust-fil-sector-builder
+
+$(MODULES): build/.update-modules ;
+
+# dummy file that marks the last time modules were updated
+build/.update-modules:
+	git submodule update --init --recursive
+	touch $@
+
+deps: $(BUILD_DEPS)
+.PHONY: deps
+
+build: $(BUILD_DEPS)
 	go build -o lotus ./cmd/lotus
+.PHONY: build
 
-.PHONY: all build deps blssigs
+dist-clean:
+	git clean -xdff
+	git submodule deinit --all -f
+.PHONY: dist-clean

daemon/cmd.go

@@ -4,7 +4,6 @@ package daemon
 
 import (
 	"context"
-
 	"github.com/multiformats/go-multiaddr"
 	"gopkg.in/urfave/cli.v2"
 

lib/sectorbuilder

@@ -0,0 +1 @@
+Subproject commit ff9bb895529ff49f019b69bcb2527df0479b3632