ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add option to build sample plugin in top-level makefile

Browse Source 
Change-Id: Ibf15eeb5fef2a3761089e6386783a1606d2e2b79
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2017-05-31 19:25:08 +02:00
committed by Neale Ranns
parent 28262a06d8
commit 0dc3f19194
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile
View File

@ -16,6 +16,7 @@ export BR=$(WS_ROOT)/build-root
CCACHE_DIR?=$(BR)/.ccache CCACHE_DIR?=$(BR)/.ccache
GDB?=gdb GDB?=gdb
PLATFORM?=vpp PLATFORM?=vpp
SAMPLE_PLUGIN?=no
MINIMAL_STARTUP_CONF="unix { interactive }" MINIMAL_STARTUP_CONF="unix { interactive }"
@ -82,6 +83,12 @@ CONFIRM=-y
FORCE=--force-yes FORCE=--force-yes
endif endif
TARGETS = vpp
ifneq ($(SAMPLE_PLUGIN),no)
TARGETS += sample-plugin
endif
.PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
.PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
.PHONY: ctags cscope .PHONY: ctags cscope
@ -141,14 +148,16 @@ help:
@echo " GDB=<path> - gdb binary to use for debugging" @echo " GDB=<path> - gdb binary to use for debugging"
@echo " PLATFORM=<name> - target platform. default is vpp" @echo " PLATFORM=<name> - target platform. default is vpp"
@echo " TEST=<filter> - apply filter to test set, see test-help" @echo " TEST=<filter> - apply filter to test set, see test-help"
@echo " SAMPLE_PLUGIN=yes - in addition build/run/debug sample plugin"
@echo "" @echo ""
@echo "Current Argument Values:" @echo "Current Argument Values:"
@echo " V = $(V)" @echo " V = $(V)"
@echo " STARTUP_CONF = $(STARTUP_CONF)" @echo " STARTUP_CONF = $(STARTUP_CONF)"
@echo " STARTUP_DIR = $(STARTUP_DIR)" @echo " STARTUP_DIR = $(STARTUP_DIR)"
@echo " GDB = $(GDB)" @echo " GDB = $(GDB)"
@echo " PLATFORM = $(PLATFORM)" @echo " PLATFORM = $(PLATFORM)"
@echo " DPDK_VERSION = $(DPDK_VERSION)" @echo " DPDK_VERSION = $(DPDK_VERSION)"
@echo " SAMPLE_PLUGIN = $(SAMPLE_PLUGIN)"
$(BR)/.bootstrap.ok: $(BR)/.bootstrap.ok:
ifeq ($(findstring y,$(UNATTENDED)),y) ifeq ($(findstring y,$(UNATTENDED)),y)
@ -251,21 +260,21 @@ dist:
@ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz @ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
build: $(BR)/.bootstrap.ok build: $(BR)/.bootstrap.ok
$(call make,$(PLATFORM)_debug,vpp-install) $(call make,$(PLATFORM)_debug,$(addsuffix -install,$(TARGETS)))
wipedist: wipedist:
@$(RM) $(BR)/*.tar.xz @$(RM) $(BR)/*.tar.xz
wipe: wipedist $(BR)/.bootstrap.ok wipe: wipedist $(BR)/.bootstrap.ok
$(call make,$(PLATFORM)_debug,vpp-wipe) $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS)))
rebuild: wipe build rebuild: wipe build
build-release: $(BR)/.bootstrap.ok build-release: $(BR)/.bootstrap.ok
$(call make,$(PLATFORM),vpp-install) $(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS)))
wipe-release: $(BR)/.bootstrap.ok wipe-release: $(BR)/.bootstrap.ok
$(call make,$(PLATFORM),vpp-wipe) $(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS)))
rebuild-release: wipe-release build-release rebuild-release: wipe-release build-release
@ -342,12 +351,14 @@ define run
@echo "WARNING: STARTUP_CONF not defined or file doesn't exist." @echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n" @echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
@cd $(STARTUP_DIR) && \ @cd $(STARTUP_DIR) && \
sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(wildcard $(1)/vpp/lib*/vpp_plugins) sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) \
plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins))
endef endef
else else
define run define run
@cd $(STARTUP_DIR) && \ @cd $(STARTUP_DIR) && \
sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(wildcard $(1)/vpp/lib*/vpp_plugins) sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') \
plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins))
endef endef
endif endif