From: Jaeyun <jy1210.jung@samsung.com>
Date: Thu, 29 Aug 2019 06:56:29 +0000 (+0900)
Subject: [Build] update build script
X-Git-Tag: accepted/tizen/unified/20190905.060558~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db62fea856e3b9dfc84b14fabd5fed6f3d538020;p=platform%2Fupstream%2Fnnstreamer.git

[Build] update build script

Fix duplicated and unnecessary code with the updation of nnstreamer features.
1. remove src-iio in android-jni (currently excluded to register the element, so unnecessary.)
2. remove option enable-nnfw in .spec (default false)
3. duplicated feature definition for tizen

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>
---

diff --git a/jni/nnstreamer.mk b/jni/nnstreamer.mk
index 6a0b36c..301873b 100644
--- a/jni/nnstreamer.mk
+++ b/jni/nnstreamer.mk
@@ -36,7 +36,6 @@ NNSTREAMER_PLUGINS_SRCS := \
     $(NNSTREAMER_GST_HOME)/tensor_repo/tensor_reposink.c \
     $(NNSTREAMER_GST_HOME)/tensor_repo/tensor_reposrc.c \
     $(NNSTREAMER_GST_HOME)/tensor_sink/tensor_sink.c \
-    $(NNSTREAMER_GST_HOME)/tensor_source/tensor_src_iio.c \
     $(NNSTREAMER_GST_HOME)/tensor_split/gsttensorsplit.c \
     $(NNSTREAMER_GST_HOME)/tensor_transform/tensor_transform.c
 
diff --git a/meson.build b/meson.build
index 3152067..91989dc 100644
--- a/meson.build
+++ b/meson.build
@@ -222,16 +222,11 @@ if get_option('enable-python')
   endif
 endif
 
-if get_option('enable-tizen')
-  add_project_arguments('-D__TIZEN__=1', language: ['c', 'cpp'])
-endif
-
 # nnfw ( details in https://review.tizen.org/gerrit/p/platform/core/ml/nnfw )
 if get_option('enable-nnfw')
-    add_project_arguments('-DENABLE_NNFW=1', language: ['c', 'cpp'])
+  add_project_arguments('-DENABLE_NNFW=1', language: ['c', 'cpp'])
 endif
 
-
 # Build nnstreamer (common, plugins)
 subdir('gst')
 
diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index 906feca..6b062ba 100644
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -64,7 +64,7 @@ BuildRequires: lcov
 # BuildRequires:	taos-ci-unittest-coverage-assessment
 %endif
 %if %{with tizen}
-BuildRequires: pkgconfig(capi-system-info)
+BuildRequires:	pkgconfig(capi-system-info)
 BuildRequires:	pkgconfig(capi-base-common)
 BuildRequires:	pkgconfig(dlog)
 BuildRequires:	gst-plugins-bad-devel
@@ -181,7 +181,7 @@ mkdir -p build
 %define enable_tf false
 %endif
 
-meson --buildtype=plain --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true -Denable-tensorflow=%{enable_tf} -Denable-pytorch=false -Denable-caffe2=false %{api} -Denable-env-var=false -Denable-symbolic-link=false -Denable-tizen=true build -Denable-nnfw=false
+meson --buildtype=plain --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --bindir=%{nnstexampledir} --includedir=%{_includedir} -Dinstall-example=true -Denable-tensorflow=%{enable_tf} -Denable-pytorch=false -Denable-caffe2=false %{api} -Denable-env-var=false -Denable-symbolic-link=false -Denable-tizen=true build
 
 ninja -C build %{?_smp_mflags}