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)
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) \
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
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 ?= ./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}'
-
-.DEFAULT = help
+# 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
@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/...
$(GO) clean -v ./...
test: ## Run unit tests
+ $(GO) version
@echo "# running tests"
$(GO) test -tags="${GO_BUILD_TAGS}" ./...
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}"
@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 -exc "cd $(BINAPI_DIR) && $(cmds)"
+ sh -ec "cd $(BINAPI_DIR) && $(cmds)"
extras:
@make -C 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}'
+
+.DEFAULT_GOAL = help
.PHONY: help \
build cmd examples clean \