Skip to content

Commit

Permalink
Merge "[BUILD] Cleanup chaintool build"
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanLevi authored and Gerrit Code Review committed Nov 29, 2016
2 parents 1a2bdb4 + 81440cc commit 0c5736c
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,12 @@ linter: testenv
@echo "LINT: Running code checks.."
@$(DRUN) hyperledger/fabric-testenv:$(DOCKER_TAG) ./scripts/golinter.sh

build/bin/chaintool: Makefile
%/chaintool: Makefile
@echo "Installing chaintool"
@mkdir -p $(@D)
curl -L https://github.com/hyperledger/fabric-chaintool/releases/download/$(CHAINTOOL_RELEASE)/chaintool > $@
chmod +x $@

%/bin/chaintool: build/bin/chaintool
@mkdir -p $(@D)
@cp $^ $@

# We (re)build a package within a docker context but persist the $GOPATH/pkg
# directory so that subsequent builds are faster
build/docker/bin/%: $(PROJECT_FILES)
Expand Down

0 comments on commit 0c5736c

Please sign in to comment.