Skip to content

Commit 36a1cf0

Browse files
C0rWinyacovm
authored andcommittedJun 12, 2018
[FAB-10430] Add make target for discovery cli
Change-Id: Ic13757516d3fd9c191d4e3811f479847aa4e3333 Signed-off-by: Artem Barger <bartem@il.ibm.com>
1 parent 528dc46 commit 36a1cf0

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed
 

‎Makefile

+11-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ PROJECT_FILES = $(shell git ls-files | grep -v ^test | grep -v ^unit-test | \
107107
RELEASE_TEMPLATES = $(shell git ls-files | grep "release/templates")
108108
IMAGES = peer orderer ccenv buildenv testenv tools
109109
RELEASE_PLATFORMS = windows-amd64 darwin-amd64 linux-amd64 linux-ppc64le linux-s390x
110-
RELEASE_PKGS = configtxgen cryptogen idemixgen configtxlator peer orderer
110+
RELEASE_PKGS = configtxgen cryptogen idemixgen discover configtxlator peer orderer
111111

112112
pkgmap.cryptogen := $(PKGNAME)/common/tools/cryptogen
113113
pkgmap.idemixgen := $(PKGNAME)/common/tools/idemixgen
@@ -116,6 +116,7 @@ pkgmap.configtxlator := $(PKGNAME)/common/tools/configtxlator
116116
pkgmap.peer := $(PKGNAME)/peer
117117
pkgmap.orderer := $(PKGNAME)/orderer
118118
pkgmap.block-listener := $(PKGNAME)/examples/events/block-listener
119+
pkgmap.discover := $(PKGNAME)/cmd/discover
119120

120121
include docker-env.mk
121122

@@ -174,6 +175,9 @@ cryptogen: $(BUILD_DIR)/bin/cryptogen
174175
idemixgen: GO_LDFLAGS=-X $(pkgmap.$(@F))/metadata.Version=$(PROJECT_VERSION)
175176
idemixgen: $(BUILD_DIR)/bin/idemixgen
176177

178+
discover: GO_LDFLAGS=-X $(pkgmap.$(@F))/metadata.Version=$(PROJECT_VERSION)
179+
discover: $(BUILD_DIR)/bin/discover
180+
177181
tools-docker: $(BUILD_DIR)/image/tools/$(DUMMY)
178182

179183
buildenv: $(BUILD_DIR)/image/buildenv/$(DUMMY)
@@ -206,7 +210,7 @@ test-cmd:
206210

207211
docker: $(patsubst %,$(BUILD_DIR)/image/%/$(DUMMY), $(IMAGES))
208212

209-
native: peer orderer configtxgen cryptogen idemixgen configtxlator
213+
native: peer orderer configtxgen cryptogen idemixgen configtxlator discover
210214

211215
linter: check-deps buildenv
212216
@echo "LINT: Running code checks.."
@@ -370,6 +374,11 @@ release/%/bin/idemixgen: $(PROJECT_FILES)
370374
mkdir -p $(@D)
371375
$(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F))
372376

377+
release/%/bin/discover: $(PROJECT_FILES)
378+
@echo "Building $@ for $(GOOS)-$(GOARCH)"
379+
mkdir -p $(@D)
380+
$(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(abspath $@) -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" $(pkgmap.$(@F))
381+
373382
release/%/bin/orderer: GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/common/metadata.%,$(METADATA_VAR))
374383

375384
release/%/bin/orderer: $(PROJECT_FILES)

0 commit comments

Comments
 (0)
Please sign in to comment.