[Tools/Parser] Add nnstreamer-parser to util package

This patch nnstreamer-parser to util package.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/debian/control b/debian/control
index 61d4202..5ae2af3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>=5.4),
  tensorflow-lite-dev, pytorch, libedgetpu1-std (>=12), libedgetpu-dev (>=12),
  openvino-dev, openvino-cpu-mkldnn [amd64], libflatbuffers-dev, flatbuffers-compiler,
  protobuf-compiler (>=3.12), libprotobuf-dev [amd64 arm64 armhf],
- tensorflow-dev [amd64], python2.7-dev
+ tensorflow-dev [amd64], python2.7-dev, flex, bison
 Standards-Version: 3.9.6
 Homepage: https://github.com/nnstreamer/nnstreamer
 

diff --git a/debian/nnstreamer-util.install b/debian/nnstreamer-util.install
index 71db4e5..a39d309 100644 (file)
--- a/debian/nnstreamer-util.install
+++ b/debian/nnstreamer-util.install
@@ -1 +1,2 @@
 /usr/lib/nnstreamer/bin/nnstreamer-check
+/usr/lib/nnstreamer/bin/nnstreamer-parser

diff --git a/debian/nnstreamer-util.links b/debian/nnstreamer-util.links
index 6b83a8a..5984a00 100644 (file)
--- a/debian/nnstreamer-util.links
+++ b/debian/nnstreamer-util.links
@@ -1 +1,2 @@
 usr/lib/nnstreamer/bin/nnstreamer-check usr/bin/nnstreamer-check
+usr/lib/nnstreamer/bin/nnstreamer-parser usr/bin/nnstreamer-parser

diff --git a/meson_options.txt b/meson_options.txt
index 70b68f5..ca74f95 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -44,4 +44,4 @@ option('framework-priority-tflite', type: 'string', value: 'tensorflow-lite,nnfw
 
 # Utilities
 option('enable-nnstreamer-check', type: 'boolean', value: true)
-option('enable-pbtxt-converter', type: 'boolean', value: false) # WIP
+option('enable-pbtxt-converter', type: 'boolean', value: true)

diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index 45e7bc0..5316f0b 100644 (file)
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -262,6 +262,10 @@ BuildRequires:     ssat >= 1.1.0
 # For ORC (Oil Runtime Compiler)
 BuildRequires: pkgconfig(orc-0.4)
 
+# For nnstreamer-parser
+BuildRequires: flex
+BuildRequires: bison
+
 # Note that debug packages generate an additional build and storage cost.
 # If you do not need debug packages, run '$ gbs -c .TAOS-CI/.gbs.conf build ... --define "_skip_debug_rpm 1"'.
 
@@ -727,6 +731,7 @@ popd
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{_bindir}
 ln -sf %{_prefix}/%{nnstbindir}/nnstreamer-check nnstreamer-check
+ln -sf %{_prefix}/%{nnstbindir}/nnstreamer-parser nnstreamer-parser
 popd
 
 %if 0%{?python3_support}
@@ -980,7 +985,9 @@ cp -r result %{buildroot}%{_datadir}/nnstreamer/unittest/
 
 %files util
 %{_bindir}/nnstreamer-check
+%{_bindir}/nnstreamer-parser
 %{_prefix}/%{nnstbindir}/nnstreamer-check
+%{_prefix}/%{nnstbindir}/nnstreamer-parser
 
 %files misc
 %{gstlibdir}/libgstjoin.so