X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=46e04ec4c11ebb20ed1f7b3a6066814e6cb4f30e;hb=5de7f6b85458615fa592a335d45c546397f32c9a;hp=e5bd0bd04a4fb5aea1f66a1d030bf898e93f664d;hpb=280b1c6c83b676ef4e592f4ecf60cb5b54b6a753;p=govpp.git

diff --git a/Makefile b/Makefile
index e5bd0bd..46e04ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,33 @@
 SHELL := /usr/bin/env bash -o pipefail
 
-VERSION ?= $(shell git describe --always --tags --dirty)
-COMMIT ?= $(shell git rev-parse HEAD)
-BUILD_STAMP ?= $(shell git log -1 --format="%ct")
+PROJECT := govpp
+
+VERSION      ?= $(shell git describe --always --tags --dirty)
+COMMIT       ?= $(shell git rev-parse HEAD)
+BUILD_STAMP  ?= $(shell git log -1 --format='%ct')
 BUILD_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BUILD_HOST ?= $(shell hostname)
 BUILD_USER ?= $(shell id -un)
 
-GO ?= go
+GOVPP_PKG := git.fd.io/govpp.git
 
-GOVPP_PKG := $(shell go list)
+VERSION_PKG := $(GOVPP_PKG)/internal/version
 LDFLAGS = \
-	-X ${GOVPP_PKG}/version.version=$(VERSION) \
-	-X ${GOVPP_PKG}/version.commitHash=$(COMMIT) \
-	-X ${GOVPP_PKG}/version.buildStamp=$(BUILD_STAMP) \
-	-X ${GOVPP_PKG}/version.buildBranch=$(BUILD_BRANCH) \
-	-X ${GOVPP_PKG}/version.buildUser=$(BUILD_USER) \
-	-X ${GOVPP_PKG}/version.buildHost=$(BUILD_HOST)
+	-X $(VERSION_PKG).version=$(VERSION) \
+	-X $(VERSION_PKG).commitHash=$(COMMIT) \
+	-X $(VERSION_PKG).buildStamp=$(BUILD_STAMP) \
+	-X $(VERSION_PKG).buildBranch=$(BUILD_BRANCH) \
+	-X $(VERSION_PKG).buildUser=$(BUILD_USER) \
+	-X $(VERSION_PKG).buildHost=$(BUILD_HOST)
+
 ifeq ($(NOSTRIP),)
 LDFLAGS += -w -s
 endif
 
 GO_BUILD_TAGS ?= novpp
 
-GO_BUILD_ARGS = -ldflags "${LDFLAGS}"
+GO_BUILD_ARGS = -ldflags "$(LDFLAGS)"
 ifneq ($(GO_BUILD_TAGS),)
 GO_BUILD_ARGS += -tags="${GO_BUILD_TAGS}"
 endif
@@ -35,41 +38,37 @@ ifeq ($(V),1)
 GO_BUILD_ARGS += -v
 endif
 
-VPP_VERSION	= $(shell dpkg-query -f '\${Version}' -W vpp)
-
-VPP_IMG 	?= ligato/vpp-base:latest
-BINAPI_DIR	?= ./examples/binapi
-
-help:
-	@echo "List of make targets:"
-	grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+# VPP Docker image to use for api generation (gen-binapi-docker)
+VPP_IMG 	      ?= ligato/vpp-base:latest
+# Local VPP directory used for binary api generation (gen-binapi-from-code)
+VPP_DIR           ?=
+# Target directory for generated go api bindings
+BINAPI_DIR	      ?= ./binapi
+# Binapi generator path
+BINAPI_GENERATOR  = ./bin/binapi-generator
 
-.DEFAULT = help
+.DEFAULT_GOAL = help
 
 bin:
 	mkdir -p bin
 
 build: ## Build all
 	@echo "# building ${VERSION}"
-	$(GO) build ${GO_BUILD_ARGS} ./...
+	go build ${GO_BUILD_ARGS} ./...
 
 cmd: bin ## Build commands
-	$(GO) build ${GO_BUILD_ARGS} -o bin ./cmd/...
+	go build ${GO_BUILD_ARGS} -o bin ./cmd/...
 
 examples: bin ## Build examples
-	$(GO) build ${GO_BUILD_ARGS} -o bin ./examples/...
-
-clean: ## Clean all
-	@echo "# cleaning"
-	$(GO) clean -v ./...
+	go build ${GO_BUILD_ARGS} -o bin ./examples/...
 
 test: ## Run unit tests
 	@echo "# running tests"
-	$(GO) test -tags="${GO_BUILD_TAGS}" ./...
+	go test -tags="${GO_BUILD_TAGS}" ./...
 
-integration: ## Run integration tests
+test-integration: ## Run integration tests
 	@echo "# running integration tests"
-	$(GO) test -tags="integration ${GO_BUILD_TAGS}" ./test/integration
+	go test -tags="integration ${GO_BUILD_TAGS}" ./test/integration
 
 lint: ## Run code linter
 	@echo "# running linter"
@@ -79,33 +78,45 @@ install: install-generator install-proxy ## Install all
 
 install-generator: ## Install binapi-generator
 	@echo "# installing binapi-generator ${VERSION}"
-	$(GO) install ${GO_BUILD_ARGS} ./cmd/binapi-generator
+	@go install ${GO_BUILD_ARGS} ./cmd/binapi-generator
 
 install-proxy: ## Install vpp-proxy
 	@echo "# installing vpp-proxy ${VERSION}"
-	$(GO) install ${GO_BUILD_ARGS} ./cmd/vpp-proxy
+	go install ${GO_BUILD_ARGS} ./cmd/vpp-proxy
 
-generate: ## Generate all
-	@echo "# generating code"
-	$(GO) generate -x ./...
+generate: generate-binapi ## Generate all
 
 generate-binapi: install-generator ## Generate binapi code
-	@echo "# generating binapi VPP $(VPP_VERSION)"
-	$(GO) generate -x "$(BINAPI_DIR)"
+	@echo "# generating binapi"
+	go generate -x "$(BINAPI_DIR)"
+
+gen-binapi-from-code: cmd-binapi-generator
+	$(eval VPP_API_DIR := ${VPP_DIR}/build-root/install-vpp-native/vpp/share/vpp/api/)
+	@echo "Generating vpp API.json and go bindings"
+	@echo "Vpp Directory ${VPP_DIR}"
+	@echo "Vpp API files ${VPP_API_DIR}"
+	@echo "Go bindings   ${BINAPI_DIR}"
+	@cd ${VPP_DIR} && make json-api-files
+	@${BINAPI_GENERATOR} \
+		--input-dir=${VPP_API_DIR} \
+	    --output-dir=${BINAPI_DIR} \
+	    --gen rpc,rest \
+	    --no-source-path-info
 
 gen-binapi-docker: install-generator ## Generate binapi code (using Docker)
 	@echo "# generating binapi in docker image ${VPP_IMG}"
 	$(eval cmds := $(shell go generate -n $(BINAPI_DIR) 2>&1 | tr "\n" ";"))
 	docker run -t --rm \
+		-e DEBUG_GOVPP \
 		-v "$(shell which binapi-generator):/usr/local/bin/binapi-generator:ro" \
-		-v "$(shell pwd):/govpp" -w /govpp \
+		-v "$(shell pwd):/govpp" \
+		-w /govpp \
 		-u "$(shell id -u):$(shell id -g)" \
 		"${VPP_IMG}" \
-	  sh -exc "cd $(BINAPI_DIR) && $(cmds)"
-
-extras:
-	@make -C extras
+	  sh -ec "cd $(BINAPI_DIR) && $(cmds)"
 
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: help \
     build cmd examples clean \