From cc4a5e8089967f0c266e9c5ed319c38c111004cd Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 30 Jul 2018 16:10:14 +0200 Subject: Move java api to extras/ Change-Id: Ibd5cbbdfb22a235442cddaebc9eae9a3c4e35ec9 Signed-off-by: Damjan Marion --- extras/rpm/vpp-suse.spec | 6 +++--- extras/rpm/vpp.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'extras/rpm') diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec index ea62eee7f9b..7fea9fe5331 100644 --- a/extras/rpm/vpp-suse.spec +++ b/extras/rpm/vpp-suse.spec @@ -227,7 +227,7 @@ done # Java bindings mkdir -p -m755 %{buildroot}%{_datadir}/java -for file in $(find %{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print ) +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 @@ -258,8 +258,8 @@ do done mkdir -p -m755 %{buildroot}%{python_sitelib}/jvppgen -install -p -m755 %{_vpp_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}%{_prefix}/bin -for i in $(ls %{_vpp_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do +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; diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index c6951bf4fab..69d4d6b1cb1 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -223,7 +223,7 @@ done # Java bindings mkdir -p -m755 %{buildroot}/usr/share/java -for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/java -type f -name '*.jar' -print ) +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 @@ -260,8 +260,8 @@ do done mkdir -p -m755 %{buildroot}%{python2_sitelib}/jvppgen -install -p -m755 %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvpp_gen.py %{buildroot}/usr/bin -for i in $(ls %{_mu_build_dir}/../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do +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; -- cgit 1.2.3-korg