From 9f0363885c4055f70517fa71201f2927302f6134 Mon Sep 17 00:00:00 2001 From: Mu-Woong Date: Mon, 29 Jun 2015 21:08:54 +0900 Subject: [PATCH] Cleanup the build script Change-Id: Ifddf53a274a9dc2a699e756561100bef75d7c882 Signed-off-by: Mu-Woong --- CMakeLists.txt | 7 ------- packaging/statistics-context-provider.spec | 19 +++++-------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18bfe7b..1e8c57d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,13 +27,6 @@ ELSE("${PROFILE}" STREQUAL "mobile") FILE(GLOB SRCS ${SRCS} src/social_dummy/*.cpp) ENDIF("${PROFILE}" STREQUAL "mobile") -# Target vs Emulator -IF("${ARCH}" STREQUAL "arm") - ADD_DEFINITIONS("-D_TARGET_") -ELSE("${ARCH}" STREQUAL "arm") - ADD_DEFINITIONS("-D_EMULATOR_") -ENDIF("${ARCH}" STREQUAL "arm") - IF("${ACTIVE_WINDOW_HOOK}" STREQUAL "on") ADD_DEFINITIONS("-D_USE_ACTIVE_WINDOW_HOOKING_") SET(provider_deps "${provider_deps} ecore ecore-x") diff --git a/packaging/statistics-context-provider.spec b/packaging/statistics-context-provider.spec index 7d7eaf8..b5f067f 100644 --- a/packaging/statistics-context-provider.spec +++ b/packaging/statistics-context-provider.spec @@ -1,11 +1,13 @@ Name: statistics-context-provider Summary: Statistics Context Provider -Version: 0.4.3 +Version: 0.5.0 Release: 1 Group: System/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz +%define BUILD_PROFILE %{?profile}%{!?profile:%{?tizen_profile_name}} + # Using the active window hooking for app monitoring, via ecore-x %define ACTIVE_WINDOW_HOOK off @@ -21,7 +23,7 @@ BuildRequires: pkgconfig(capi-system-runtime-info) BuildRequires: pkgconfig(capi-media-sound-manager) BuildRequires: pkgconfig(capi-network-wifi) -%if "%{?tizen_profile_name}" == "mobile" +%if "%{?BUILD_PROFILE}" == "mobile" BuildRequires: pkgconfig(contacts-service2) BuildRequires: pkgconfig(capi-content-media-content) %endif @@ -31,12 +33,6 @@ BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(ecore-x) %endif -%ifarch %{arm} -%define ARCH arm -%else -%define ARCH i586 -%endif - %description Statistics Context Provider @@ -55,13 +51,11 @@ export CXXFLAGS+=" -Wno-unused-parameter -Wno-empty-body" export CFLAGS+=" -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-strict-aliasing -fno-unroll-loops -fsigned-char -fstrict-overflow -fno-common" export CXXFLAGS+=" -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-strict-aliasing -fno-unroll-loops -fsigned-char -fstrict-overflow" -%define BINTYPE engineer export CFLAGS+=" -DTIZEN_ENGINEER_MODE" export CXXFLAGS+=" -DTIZEN_ENGINEER_MODE" export FFLAGS+=" -DTIZEN_ENGINEER_MODE" -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=%{ARCH} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?tizen_profile_name} \ - -DBINTYPE=%{BINTYPE} -DACTIVE_WINDOW_HOOK=%{ACTIVE_WINDOW_HOOK} +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?BUILD_PROFILE} -DACTIVE_WINDOW_HOOK=%{ACTIVE_WINDOW_HOOK} make %{?jobs:-j%jobs} %install @@ -82,9 +76,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %defattr(-,root,root,-) %{_libdir}/*.so* /usr/share/license/%{name} -#%if %{BINTYPE} == "engineer" -#/usr/bin/* -#%endif %package devel Summary: Statistics Context Provider (Development) -- 2.7.4