From 4e633e1043e867fd24badeb0405f794793beb9a9 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Thu, 31 Jan 2019 10:57:40 +0100
Subject: VPP-1504: Remove JVPP

As part of JVPP migration this removes JVPP completely from VPP.

Change-Id: I6b74e7961aa474ae471e63fe43a624cd9fc3659b
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 extras/rpm/vpp-suse.spec | 32 --------------------------------
 extras/rpm/vpp.spec      | 29 +----------------------------
 2 files changed, 1 insertion(+), 60 deletions(-)

(limited to 'extras/rpm')

diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec
index 91e12baa63e..cbe68607eb8 100644
--- a/extras/rpm/vpp-suse.spec
+++ b/extras/rpm/vpp-suse.spec
@@ -41,7 +41,6 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  glibc-devel
 BuildRequires:  glibc-devel-static
-BuildRequires:  java-devel >= 1.8
 BuildRequires:  libboost_headers-devel
 BuildRequires:  libboost_thread-devel
 BuildRequires:  libnuma-devel
@@ -125,18 +124,6 @@ Provides:       %{name}-any-api-lua = %{version}
 %description api-lua
 This package contains the lua bindings for the vpp api
 
-%package api-java
-Summary:        VPP api java bindings
-Group:          Development/Libraries/Java
-Requires:       %{lname} = %{version}
-Requires:       %{name} = %{version}
-Requires:       %{name}-devel = %{version}
-Conflicts:      otherproviders(%{name}-any-api-java)
-Provides:       %{name}-any-api-java = %{version}
-
-%description api-java
-This package contains the java bindings for the vpp api
-
 %package api-python
 Summary:        VPP api python bindings
 Group:          Development/Libraries/Python
@@ -223,13 +210,6 @@ do
            %{buildroot}%{_datadir}/doc/vpp/examples/lua/$file
 done
 
-# Java bindings
-mkdir -p -m755 %{buildroot}%{_datadir}/java
-for file in $(find %{_vpp_install_dir}/japi/share/java -type f -name '*.jar' -print )
-do
-        install -p -m 644 $file %{buildroot}%{_datadir}/java
-done
-
 # Python bindings
 cd %{_vpp_build_dir}/../src/vpp-api/python && %{py2_install}
 
@@ -255,12 +235,6 @@ do
 	done
 done
 
-mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen
-install -p -m755 %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin
-for i in $(ls %{_vpp_build_dir}/../extras/japi/java/jvpp/gen/jvppgen/*.py); do
-   install -p -m755 ${i} %{buildroot}%{python_sitelib}/jvppgen
-done;
-
 # sample plugin
 mkdir -p -m755 %{buildroot}%{_datadir}/doc/vpp/examples/sample-plugin/sample
 for file in $(cd %{_vpp_install_dir}/../../sample-plugin && find -type f -print)
@@ -329,20 +303,14 @@ export NO_BRP_CHECK_RPATH=true
 %files api-lua
 %{_datadir}/doc/vpp/examples/lua
 
-%files api-java
-%{_datadir}/java/*
-
 %files api-python
 %dir %{python_sitelib}/vpp_papi*
 %{python_sitelib}/vpp_papi*
 
 %files devel
-%dir %{python_sitelib}/jvppgen
-%{python_sitelib}/jvppgen/*
 %dir %{_datadir}/doc/vpp
 %dir %{_datadir}/doc/vpp/examples
 %{_libdir}/*.so
-%{_bindir}/jvpp_gen.py
 %{_includedir}/*
 %{_datadir}/doc/vpp/examples/sample-plugin
 %dir %{_datadir}/vpp
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index ef282237088..db775a1e7bd 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -64,7 +64,7 @@ BuildRequires: cmake3
 %endif
 %endif
 BuildRequires: libffi-devel
-BuildRequires: glibc-static, java-1.8.0-openjdk, java-1.8.0-openjdk-devel yum-utils, redhat-lsb
+BuildRequires: glibc-static, yum-utils, redhat-lsb
 BuildRequires: apr-devel
 BuildRequires: numactl-devel
 BuildRequires: autoconf automake libtool byacc bison flex
@@ -123,14 +123,6 @@ Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
 %description api-lua
 This package contains the lua bindings for the vpp api
 
-%package api-java
-Summary: VPP api java bindings
-Group: Development/Libraries
-Requires: vpp = %{_version}-%{_release}, vpp-lib = %{_version}-%{_release}
-
-%description api-java
-This package contains the java bindings for the vpp api
-
 %package api-python
 Summary: VPP api python bindings
 Group: Development/Libraries
@@ -220,13 +212,6 @@ do
 	   %{buildroot}/usr/share/doc/vpp/examples/lua/$file )
 done
 
-# Java bindings
-mkdir -p -m755 %{buildroot}/usr/share/java
-for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/japi/share/java -type f -name '*.jar' -print )
-do
-	install -p -m 644 $file %{buildroot}/usr/share/java
-done
-
 # Python bindings
 cd %{_mu_build_dir}/../src/vpp-api/python && %py2_install
 
@@ -258,12 +243,6 @@ do
 	done
 done
 
-mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen
-install -p -m755 %{_mu_build_dir}/../extras/japi/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin
-for i in $(ls %{_mu_build_dir}/../extras/japi/java/jvpp/gen/jvppgen/*.py); do
-   install -p -m666 ${i} %{buildroot}%{python2_sitelib}/jvppgen
-done;
-
 install -p -m 644 %{_mu_build_dir}/../src/tools/vppapigen/vppapigen_c.py %{buildroot}/usr/share/vpp
 install -p -m 644 %{_mu_build_dir}/../src/tools/vppapigen/vppapigen_json.py %{buildroot}/usr/share/vpp
 
@@ -388,10 +367,6 @@ fi
 %defattr(644,root,root,644)
 /usr/share/doc/vpp/examples/lua
 
-%files api-java
-%defattr(644,root,root)
-/usr/share/java/*
-
 %files api-python
 %defattr(644,root,root,755)
 %{python2_sitelib}/vpp_*
@@ -404,9 +379,7 @@ fi
 %files devel
 %defattr(-,bin,bin)
 /usr/bin/vppapigen
-/usr/bin/jvpp_gen.py
 %{_includedir}/*
-%{python2_sitelib}/jvppgen/*
 /usr/share/doc/vpp/examples/sample-plugin
 /usr/share/vpp
 
-- 
cgit 1.2.3-korg