Move java,lua api and remaining plugins to src/

Change-Id: I1c3b87e886603678368428ae56a6bd3327cbc90d
Signed-off-by: Damjan Marion <damarion@cisco.com>

6 files changed, 16 insertions, 100 deletions

diff --git a/build-data/packages/plugins.mk b/build-data/packages/plugins.mk
deleted file mode 100644
index b4d67a28abd..00000000000
--- a/build-data/packages/plugins.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-plugins_configure_depend = 			\
-    vpp-api-install				\
-    vpp-install
-
-plugins_CPPFLAGS = $(call installed_includes_fn, \
-    vpp  \
-    vpp-api)
-
-plugins_LDFLAGS = $(call installed_libs_fn,     \
-    vpp)
-
-ifeq ($($(PLATFORM)_enable_tests),yes)
-plugins_configure_args += --enable-tests
-endif
-
-# Platform dependent configure flags
-plugins_configure_args += $(plugins_configure_args_$(PLATFORM))
-
-# include & link with openssl only if needed
-ifneq ($($(PLATFORM)_uses_openssl),no)
-plugins_CPPFLAGS += $(call installed_includes_fn, openssl)
-plugins_LDFLAGS += $(call installed_libs_fn, openssl)
-endif
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-plugins_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-plugins_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-plugins_configure_depend += dpdk-install
-plugins_CPPFLAGS += $(call installed_includes_fn, dpdk)
-plugins_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-endif
diff --git a/build-data/packages/vnet.mk b/build-data/packages/vnet.mk
deleted file mode 100644
index 57c444e8318..00000000000
--- a/build-data/packages/vnet.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-vnet_configure_depend = 			\
-    vppinfra-install 				\
-    svm-install					\
-    vlib-api-install 				\
-    vlib-install 
-
-vnet_CPPFLAGS = $(call installed_includes_fn, 	\
-    vppinfra 					\
-    svm						\
-    vlib 					\
-    vlib-api)
-
-vnet_LDFLAGS = $(call installed_libs_fn, 	\
-    vppinfra					\
-    svm						\
-    vlib					\
-    vlib-api)
-
-ifeq ($($(PLATFORM)_enable_tests),yes)
-vnet_configure_args += --enable-tests
-endif
-
-# Platform dependent configure flags
-vnet_configure_args += $(vnet_configure_args_$(PLATFORM))
-
-# include & link with openssl only if needed
-ifneq ($($(PLATFORM)_uses_openssl),no)
-vnet_CPPFLAGS += $(call installed_includes_fn, openssl)
-vnet_LDFLAGS += $(call installed_libs_fn, openssl)
-endif
-
-ifneq ($($(PLATFORM)_uses_dpdk),no)
-ifeq ($($(PLATFORM)_uses_external_dpdk),yes)
-vnet_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir)
-vnet_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir)
-else
-vnet_configure_depend += dpdk-install
-vnet_CPPFLAGS += $(call installed_includes_fn, dpdk)
-vnet_LDFLAGS += $(call installed_libs_fn, dpdk)
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes)
-vnet_configure_args += --with-dpdk-crypto
-endif
-ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes)
-vnet_configure_args += --with-dpdk-mlx5-pmd
-endif
-endif
diff --git a/build-data/packages/vpp-api.mk b/build-data/packages/vpp-api.mk
deleted file mode 100644
index d9e8d72e182..00000000000
--- a/build-data/packages/vpp-api.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-vpp-api_configure_depend =			\
-	vpp-install
-
-vpp-api_CPPFLAGS = $(call installed_includes_fn,	\
-	vpp)
-
-vpp-api_LDFLAGS =
-
-vpp-api_CPPFLAGS += -I/usr/lib/jvm/java-8-openjdk-amd64/include
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 88dd3ed813b..6f21b6dc6bf 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -25,7 +25,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 									\
 	: generate file manifests ;					\
 	find $(INSTALL_PREFIX)$(ARCH)/*/bin -type f -print		\
-	  | sed -e 's:.*:../& /usr/bin:'				\
+	  | sed -e 's:.*:../& /usr/bin:' | grep -v vppapigen		\
 	    > deb/debian/vpp.install ;					\
 									\
 	: core api definitions ;					\
@@ -51,9 +51,17 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	./scripts/find-plugins-contents $(INSTALL_PREFIX)$(ARCH)	\
 	 deb/debian/vpp-plugins.install ;				\
 									\
-	: python-api package ;						\
-	./scripts/find-python-api-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp-python-api.install ;				\
+	: vpp-api-lua package ;						\
+	./scripts/find-vpp-api-lua-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-api-lua.install ;				\
+									\
+	: vpp-api-java package ;					\
+	./scripts/find-vpp-api-java-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-api-java.install ;				\
+									\
+	: vpp-api-python package ;					\
+	./scripts/find-vpp-api-python-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-api-python.install ;				\
 									\
 	: dpdk headers ;						\
 	./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH)		\
@@ -70,9 +78,9 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	: dev package needs a couple of additions ;			\
 	echo ../build-tool-native/tools/vppapigen /usr/bin		\
 	   >> deb/debian/vpp-dev.install ;				\
-	echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin		\
+	echo ../../src/vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
-	for i in $$(ls ../vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
+	for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
 	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
 	       >> deb/debian/vpp-dev.install;				\
 	done;								\
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 513a4db40bc..c9a214acc3a 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -29,15 +29,13 @@ vpp_uses_dpdk = yes
 # Uncoment to enable building unit tests
 # vpp_enable_tests = yes
 
-vpp_root_packages = vpp vpp-api gmod plugins
+vpp_root_packages = vpp gmod
 
 vpp_configure_args_vpp = --with-dpdk
 
 # Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
 vlib_configure_args_vpp = --with-pre-data=128
 
-plugins_configure_args_vpp = --with-dpdk
-
 # DPDK configuration parameters
 # vpp_uses_dpdk_cryptodev = yes
 # vpp_uses_dpdk_mlx5_pmd = yes
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index 55805d1002a..a556b4879e9 100644
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -27,7 +27,7 @@ vpp_lite_uses_dpdk = no
 # Uncoment to enable building unit tests
 #vpp_lite_enable_tests = yes
 
-vpp_lite_root_packages = vpp vpp-api gmod
+vpp_lite_root_packages = vpp gmod
 
 vlib_configure_args_vpp_lite = --with-pre-data=128