Remove unnecessary allocation

[govpp.git] / Makefile

diff --git a/Makefile b/Makefile
index bd11c26..0ae100b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ 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")
+BUILD_STAMP ?= $(shell git log -1 --format='%ct')
 BUILD_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
 
 BUILD_HOST ?= $(shell hostname)
@@ -10,7 +10,7 @@ BUILD_USER ?= $(shell id -un)
 
 GO ?= go
 
-GOVPP_PKG := $(shell go list)
+GOVPP_PKG := git.fd.io/govpp.git
 LDFLAGS = \
        -X ${GOVPP_PKG}/version.version=$(VERSION) \
        -X ${GOVPP_PKG}/version.commitHash=$(COMMIT) \
@@ -35,10 +35,16 @@ ifeq ($(V),1)
 GO_BUILD_ARGS += -v
 endif
 
-VPP_VERSION    = $(shell dpkg-query -f '\${Version}' -W vpp)
+VPP_VERSION    ?= $(shell dpkg-query -f '\${Version}' -W vpp)
 
-VPP_IMG        ?= ligato/vpp-base:latest
-BINAPI_DIR     ?= ./binapi
+# 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
 
 bin:
        mkdir -p bin
@@ -47,6 +53,9 @@ build: ## Build all
        @echo "# building ${VERSION}"
        $(GO) build ${GO_BUILD_ARGS} ./...
 
+cmd-binapi-generator: bin ## Build commands
+       $(GO) build ${GO_BUILD_ARGS} -o bin ./cmd/binapi-generator
+
 cmd: bin ## Build commands
        $(GO) build ${GO_BUILD_ARGS} -o bin ./cmd/...
 
@@ -88,13 +97,27 @@ generate-binapi: install-generator ## Generate binapi code
        @echo "# generating binapi VPP $(VPP_VERSION)"
        $(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 -ec "cd $(BINAPI_DIR) && $(cmds)"
@@ -104,9 +127,9 @@ extras:
 
 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}'
+       @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-.DEFAULT = help
+.DEFAULT_GOAL = help
 
 .PHONY: help \
     build cmd examples clean \