From 3535222f979742d65c28a312d415aa6831f816d6 Mon Sep 17 00:00:00 2001
From: Pierre Pfister <ppfister@cisco.com>
Date: Fri, 27 May 2016 10:30:13 +0100
Subject: VPP-94: Add build-data directory for plugins and Makefile target

Commit e36af5f3153 moved sample-plugin a dedicated directory.
The build system could not find sources for sample-plugin-* targets.
This commit adds a dedicated build-data/packages directory for
plugins and moves sample-plugin.mk there.

Change-Id: I9e3ee8858580e86ff6d4f7317300df0a5e239a01
Signed-off-by: Pierre Pfister <ppfister@cisco.com>
---
 Makefile                                     |  8 ++++-
 build-data/packages/sample-plugin.mk         | 47 ----------------------------
 build-root/bootstrap.sh                      |  2 +-
 plugins/build-data/packages/sample-plugin.mk | 47 ++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 49 deletions(-)
 delete mode 100644 build-data/packages/sample-plugin.mk
 create mode 100644 plugins/build-data/packages/sample-plugin.mk

diff --git a/Makefile b/Makefile
index 2dd38fdd..d3088d24 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ ifeq ($(OS_ID),ubuntu)
 	fi ; \
 	exit 0
 endif
-	@echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
+	@echo "SOURCE_PATH = $(WS_ROOT) $(WS_ROOT)/plugins"> $(BR)/build-config.mk
 	@echo "#!/bin/bash\n"                              > $(BR)/path_setup
 	@echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup
 	@echo 'export PATH=$(BR)/tools/bin:$$PATH'        >> $(BR)/path_setup
@@ -162,6 +162,12 @@ wipe-release: $(BR)/.bootstrap.ok
 
 rebuild-release: wipe-release build-release
 
+plugins: $(BR)/.bootstrap.ok
+	$(call make,$(PLATFORM)_debug,sample-plugin-install)
+
+plugins-release: $(BR)/.bootstrap.ok
+	$(call make,$(PLATFORM),sample-plugin-install)
+
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk
deleted file mode 100644
index 047a26f5..00000000
--- a/build-data/packages/sample-plugin.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-sample-plugin_configure_depend =		\
-	vppinfra-install			\
-	svm-install				\
-	vlib-api-install			\
-	vlib-install				\
-	vnet-install				\
-	vpp-install				\
-	vpp-api-test-install
-
-sample-plugin_CPPFLAGS = $(call installed_includes_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-        vpp-api-test)
-
-sample-plugin_LDFLAGS = $(call installed_libs_fn,	\
-	vppinfra					\
-	openssl						\
-	svm						\
-	vlib						\
-	vlib-api					\
-	vnet						\
-	vpp						\
-	vpp-api-test)
-
-sample-plugin_post_install = \
-	mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; 	\
-	cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so 			\
-	  $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
-
-sample-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-sample-plugin_configure_args = --with-dpdk
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-sample-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-sample-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-sample-plugin_configure_depend += dpdk-install
-sample-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk)
-sample-plugin_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh
index f83734fd..2419b6ae 100755
--- a/build-root/bootstrap.sh
+++ b/build-root/bootstrap.sh
@@ -12,7 +12,7 @@ ADD_TO_PATH="$build_root/tools/ccache-bin:$build_root/tools/bin"
 
 # Construct build-config.mk
 cd $build_root
-echo SOURCE_PATH = $wsroot > build-config.mk
+echo SOURCE_PATH = $wsroot $wsroot/plugins/ > build-config.mk
 echo 
 echo Saving PATH settings in `pwd`/path_setup
 echo Source this file later, as needed
diff --git a/plugins/build-data/packages/sample-plugin.mk b/plugins/build-data/packages/sample-plugin.mk
new file mode 100644
index 00000000..047a26f5
--- /dev/null
+++ b/plugins/build-data/packages/sample-plugin.mk
@@ -0,0 +1,47 @@
+sample-plugin_configure_depend =		\
+	vppinfra-install			\
+	svm-install				\
+	vlib-api-install			\
+	vlib-install				\
+	vnet-install				\
+	vpp-install				\
+	vpp-api-test-install
+
+sample-plugin_CPPFLAGS = $(call installed_includes_fn,	\
+	vppinfra					\
+	openssl						\
+	svm						\
+	vlib						\
+	vlib-api					\
+	vnet						\
+	vpp						\
+        vpp-api-test)
+
+sample-plugin_LDFLAGS = $(call installed_libs_fn,	\
+	vppinfra					\
+	openssl						\
+	svm						\
+	vlib						\
+	vlib-api					\
+	vnet						\
+	vpp						\
+	vpp-api-test)
+
+sample-plugin_post_install = \
+	mkdir -p $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins ; 	\
+	cp $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/*.so 			\
+	  $(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/vlib_plugins
+
+sample-plugin_image_include = echo $(arch_lib_dir)/vlib_plugins
+
+ifneq ($($(PLATFORM)_uses_dpdk),no)
+sample-plugin_configure_args = --with-dpdk
+ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
+sample-plugin_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
+sample-plugin_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
+else
+sample-plugin_configure_depend += dpdk-install
+sample-plugin_CPPFLAGS += $(call installed_includes_fn, dpdk)
+sample-plugin_LDFLAGS += $(call installed_libs_fn, dpdk)
+endif
+endif
-- 
cgit 1.2.3-korg