aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorNathan Skrzypczak <nathan.skrzypczak@gmail.com>2022-05-30 17:18:34 +0200
committerNathan Skrzypczak <nathan.skrzypczak@gmail.com>2022-05-30 18:49:43 +0200
commite9567fa8c853dda16c54afbd2ba99b7263fa37f1 (patch)
treef722a72f13cccdd9f13bdaff200e734849ee0853 /Makefile
parent4102c72bce694babd94a481b1201d33895a6f9c5 (diff)
binapi: remove internal/testbinapi
This patch is a proposal to remove the necessity to version two versions of the generated api. We would rely on `./binapi/` for 'internal' logic, making the dependancy on VPP a bit stronger, but removing a folder and a .json file we don't upgrade regularly. Signed-off-by: Nathan Skrzypczak <nathan.skrzypczak@gmail.com> Change-Id: I99063ed571eb193271b3cda805d692155ac90f61
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 1 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index c2342a0..6fc229b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ GOVPP_PKG := git.fd.io/govpp.git
VPP_API_DIR ?= ${VPP_DIR}/build-root/install-vpp-native/vpp/share/vpp/api
-VERSION_PKG := $(GOVPP_PKG)/internal/version
+VERSION_PKG := $(GOVPP_PKG)/version
LDFLAGS = \
-X $(VERSION_PKG).version=$(VERSION) \
-X $(VERSION_PKG).commitHash=$(COMMIT) \
@@ -49,8 +49,6 @@ BINAPI_DIR ?= ./binapi
# Binapi generator path
BINAPI_GENERATOR = ./bin/binapi-generator
-INTERNAL_BINAPI_DIR ?= ./internal/testbinapi/binapi2001
-
.DEFAULT_GOAL = help
check-%:
@@ -110,10 +108,6 @@ generate-binapi: install-generator ## Generate binapi code
@echo "# generating binapi"
@go generate -x "$(BINAPI_DIR)"
-.PHONY: gen-binapi-internal
-gen-binapi-internal:
- @go generate $(INTERNAL_BINAPI_DIR)
-
.PHONY: gen-binapi-local
gen-binapi-local: binapi-generator check-VPP_DIR ## Generate binapi code (using locally cloned VPP)
@make -C ${VPP_DIR} json-api-files