Build gtest package for multimedia HAL APIs without additional step

- Remove tc_env_setup.sh script
- Change camera HAL tc name from camera_hal_tc to camera_hal_gtests

[Version] 0.0.5
[Profile] Common
[Issue Type] Update
[Dependency module] N/A

Change-Id: I0329e20de1ffa0ec85f389b82d2b8455ccbbbcb2
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..efb1910
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = testcase
+

diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..2f43082
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+libtoolize --copy --force
+aclocal -I m4 
+autoheader
+autoconf
+automake -a -c

diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..3898f00
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,36 @@
+AC_PREREQ(2.52)
+
+AC_INIT([mm-hal-testcase], [0.8.0])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AC_CONFIG_HEADERS([config.h:config.hin])
+AC_CONFIG_MACRO_DIR([m4])
+
+# Checks for programs.
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_CC_C_O
+AC_C_CONST
+AC_HEADER_STDBOOL
+AC_HEADER_STDC
+AC_HEADER_TIME
+AC_PROG_GCC_TRADITIONAL
+AC_PROG_LIBTOOL
+
+# Checks for libraries.
+PKG_CHECK_MODULES(GLIB, glib-2.0)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+PKG_CHECK_MODULES(DLOG, dlog)
+AC_SUBST(DLOG_CFLAGS)
+AC_SUBST(DLOG_LIBS)
+
+# Checks for library functions.
+AC_CONFIG_FILES([
+Makefile
+testcase/Makefile
+testcase/camera/Makefile
+])
+AC_OUTPUT
+

diff --git a/mm-hal-gtests.manifest b/mm-hal-gtests.manifest
new file mode 100644 (file)
index 0000000..a76fdba
--- /dev/null
+++ b/mm-hal-gtests.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/packaging/mm-hal-interface.spec b/packaging/mm-hal-interface.spec
index ab969964bf35443ea58ffe8da6653f4318151053..7bb21291958150bea6e51fb652496a9b965fba39 100644 (file)
--- a/packaging/mm-hal-interface.spec
+++ b/packaging/mm-hal-interface.spec
@@ -1,28 +1,55 @@
 Name:       mm-hal-interface
 Summary:    Multimedia HAL Interface
-Version:    0.0.4
+Version:    0.0.5
 Release:    0
 Group:      Multimedia/Development
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-BuildArch:  noarch
 
 %description
 Multimedia framework hardware abstraction layer interface package.
 
+
+%package -n camera-hal-gtests
+Summary:    gtest for camera HAL APIs
+Group:      Development/Tools
+Version:    %{version}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  gtest-devel
+
+%description -n camera-hal-gtests
+gtest for camera HAL APIs.
+
+
 %prep
 %setup -q
 
 %build
-
+export CFLAGS+=" -D_LARGEFILE64_SOURCE"
+./autogen.sh
+%configure --disable-static
+make %{?jobs:-j%jobs}
 
 %install
 install -d -m 755 %{buildroot}%{_includedir}
 install -m 644 include/audio/*.h %{buildroot}%{_includedir}
 install -m 644 include/camera/*.h %{buildroot}%{_includedir}
 install -m 644 include/radio/*.h %{buildroot}%{_includedir}
+%make_install
+
+%post -n camera-hal-gtests -p /sbin/ldconfig
+%postun -n camera-hal-gtests -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %{_includedir}/*.h
 %license LICENSE.APLv2
+
+%files -n camera-hal-gtests
+%manifest mm-hal-gtests.manifest
+%license LICENSE.APLv2
+%defattr(-,root,root,-)
+%{_bindir}/camera_*

diff --git a/tc_env_setup.sh b/tc_env_setup.sh
deleted file mode 100755 (executable)
index f3b2a97..0000000
--- a/tc_env_setup.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-
-# variable
-tc_build_dir=testcase/build
-tc_build_files="Makefile.am autogen.sh configure.ac mm-hal-testcase.manifest"
-spec_path_interface=packaging/mm-hal-interface.spec
-spec_path_testcase=packaging/mm-hal-testcase.spec
-
-# usage
-print_usage()
-{
-    echo "[usage] : $0 [y|n]"
-    echo " - y : set up environment to build testcase"
-    echo " - n : remove environment to build testcase"
-    exit 0
-}
-
-# check argument
-if [ $# != 1 ]
-then
-
-    print_usage
-
-fi
-
-if [ $1 = "y" ]
-then
-    # set up TC build environment
-    for file in $tc_build_files
-    do
-        mv $tc_build_dir/$file .
-    done
-
-    mv $spec_path_interface $spec_path_interface.bak
-    mv $spec_path_testcase.bak $spec_path_testcase
-
-elif [ $1 = "n" ]
-then
-    # reset TC build environment
-    for file in $tc_build_files
-    do
-        mv $file $tc_build_dir
-    done
-
-    mv $spec_path_interface.bak $spec_path_interface
-    mv $spec_path_testcase $spec_path_testcase.bak
-
-else
-
-    echo "Unknown argument : $1"
-    print_usage
-
-fi
-
-exit 0
-

diff --git a/testcase/Makefile.am b/testcase/Makefile.am
index 32fae42835e4a4b09b5bb2aab126f447f3de48c1..ac1b359a44a92d58c9bd35c72504b46487a2fe91 100644 (file)
--- a/testcase/Makefile.am
+++ b/testcase/Makefile.am
@@ -1,4 +1,2 @@
-if TC_CAMERA
 SUBDIRS = camera
-endif
 

diff --git a/testcase/build/Makefile.am b/testcase/build/Makefile.am
deleted file mode 100644 (file)
index efb1910..0000000
--- a/testcase/build/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = testcase
-

diff --git a/testcase/build/autogen.sh b/testcase/build/autogen.sh
deleted file mode 100755 (executable)
index 2f43082..0000000
--- a/testcase/build/autogen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-libtoolize --copy --force
-aclocal -I m4 
-autoheader
-autoconf
-automake -a -c

diff --git a/testcase/build/configure.ac b/testcase/build/configure.ac
deleted file mode 100644 (file)
index ec4cd95..0000000
--- a/testcase/build/configure.ac
+++ /dev/null
@@ -1,46 +0,0 @@
-AC_PREREQ(2.52)
-
-AC_INIT([mm-hal-testcase], [0.8.0])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-AC_CONFIG_HEADERS([config.h:config.hin])
-AC_CONFIG_MACRO_DIR([m4])
-
-# Checks for programs.
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AC_C_CONST
-AC_HEADER_STDBOOL
-AC_HEADER_STDC
-AC_HEADER_TIME
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_LIBTOOL
-
-# Checks for libraries.
-AC_ARG_ENABLE(tc-camera, AC_HELP_STRING([--enable-tc-camera], [enable tc-camera]),
-[
-  case "${enableval}" in
-    yes) TC_CAMERA=yes ;;
-    no)  TC_CAMERA=no ;;
-    *) AC_MSG_ERROR(bad value ${enableval} for --enable-tc-camera) ;;
-  esac
-],[TC_CAMERA=no])
-AM_CONDITIONAL([TC_CAMERA], [test "x$TC_CAMERA" = "xyes"])
-
-PKG_CHECK_MODULES(GLIB, glib-2.0)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(DLOG, dlog)
-AC_SUBST(DLOG_CFLAGS)
-AC_SUBST(DLOG_LIBS)
-
-# Checks for library functions.
-AC_CONFIG_FILES([
-Makefile
-testcase/Makefile
-testcase/camera/Makefile
-])
-AC_OUTPUT
-

diff --git a/testcase/build/mm-hal-testcase.manifest b/testcase/build/mm-hal-testcase.manifest
deleted file mode 100644 (file)
index a76fdba..0000000
--- a/testcase/build/mm-hal-testcase.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-</manifest>

diff --git a/testcase/camera/Makefile.am b/testcase/camera/Makefile.am
index 1699fa8136ecf41950a30e20bd54f71d47cb2b24..13e0782ec25a664dd7eeb1f36d99e6cdffd0e7c7 100644 (file)
--- a/testcase/camera/Makefile.am
+++ b/testcase/camera/Makefile.am
@@ -1,12 +1,12 @@
 # with gtest
-bin_PROGRAMS = camera_hal_tc
+bin_PROGRAMS = camera_hal_gtests
 
-camera_hal_tc_SOURCES = camera_hal_tc.cpp camera_hal_interface.c
+camera_hal_gtests_SOURCES = camera_hal_tc.cpp camera_hal_interface.c
 
-camera_hal_tc_CFLAGS = $(GLIB_CFLAGS) $(DLOG_CFLAGS)
-camera_hal_tc_CPPFLAGS = $(GLIB_CFLAGS) $(DLOG_CFLAGS)
+camera_hal_gtests_CFLAGS = $(GLIB_CFLAGS) $(DLOG_CFLAGS)
+camera_hal_gtests_CPPFLAGS = $(GLIB_CFLAGS) $(DLOG_CFLAGS) -I$(srcdir)/../../include/camera
 
-camera_hal_tc_LDADD = \
+camera_hal_gtests_LDADD = \
        -ldl \
        -lgtest \
        $(GLIB_LIBS) \