From b6eeb37e6d43873e079fa4f9f205fc27bf59ccce Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 24 Dec 2018 11:48:35 +0900 Subject: [PATCH] Revert "Change daemon from org.tizen.autofill-daemon to org.tizen.autofilld" This reverts commit 25752f066a4c59969839c1163823e12571751729. Change-Id: Id26395297daae1e0101b9340aa853f653aa130a5 --- CMakeLists.txt | 8 ++++++ client/autofill.c | 2 +- manager/autofill_manager.c | 2 +- packaging/capi-ui-autofill.spec | 29 ++++++++++++++++++++- server/CMakeLists.txt | 43 +++++++++++++++++++++++++++++++ server/org.tizen.autofill-daemon.manifest | 5 ++++ server/org.tizen.autofill-daemon.xml | 14 ++++++++++ 7 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 server/CMakeLists.txt create mode 100644 server/org.tizen.autofill-daemon.manifest create mode 100644 server/org.tizen.autofill-daemon.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 71a1b45..ce0756d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,3 +32,11 @@ ADD_SUBDIRECTORY(service_lib) ## Manager library ## ADD_SUBDIRECTORY(manager) + +## Server daemon ## +ADD_SUBDIRECTORY(server) + +## Config ## +#INSTALL(FILES ${CMAKE_SOURCE_DIR}/autofill-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/voice/autofill/1.0) + +#INSTALL(FILES ${CMAKE_SOURCE_DIR}/autofill-server.conf DESTINATION /etc/dbus-1/session.d) diff --git a/client/autofill.c b/client/autofill.c index 6318d3d..52cfeb0 100644 --- a/client/autofill.c +++ b/client/autofill.c @@ -25,7 +25,7 @@ #include "autofill_private.h" #include "autofill_proxy.h" -#define AUTOFILL_DAEMON_APP_ID "org.tizen.autofilld" +#define AUTOFILL_DAEMON_APP_ID "org.tizen.autofill-daemon" #ifdef LOG_TAG #undef LOG_TAG diff --git a/manager/autofill_manager.c b/manager/autofill_manager.c index e2becfc..a047ba1 100644 --- a/manager/autofill_manager.c +++ b/manager/autofill_manager.c @@ -24,7 +24,7 @@ #include "autofill_manager_proxy.h" #include "../privilege_checker/privilege_checker_private.h" -#define AUTOFILL_DAEMON_APP_ID "org.tizen.autofilld" +#define AUTOFILL_DAEMON_APP_ID "org.tizen.autofill-daemon" #ifdef LOG_TAG #undef LOG_TAG diff --git a/packaging/capi-ui-autofill.spec b/packaging/capi-ui-autofill.spec index caf6e4e..009e7d7 100644 --- a/packaging/capi-ui-autofill.spec +++ b/packaging/capi-ui-autofill.spec @@ -87,6 +87,15 @@ Requires: %{name} = %{version}-%{release} Autofill Manager Library (Development) +%package -n org.tizen.autofill-daemon +Summary: Autofill Daemon application +Group: Graphics & UI Framework/Input +Requires: %{name} = %{version}-%{release} + +%description -n org.tizen.autofill-daemon +Autofill Daemon application + + %prep %setup -q @@ -94,6 +103,14 @@ tidlc -p -l C -i tidl/autofill.tidl -o autofill_proxy mv autofill_proxy.h ./client/ mv autofill_proxy.c ./client/ +tidlc -s -l C -i tidl/autofill.tidl -o autofill_stub +mv autofill_stub.h ./server/ +mv autofill_stub.c ./server/ + +tidlc -p -l C -i tidl/autofill_service.tidl -o autofill_service_proxy +mv autofill_service_proxy.h ./server/ +mv autofill_service_proxy.c ./server/ + tidlc -s -l C -i tidl/autofill_service.tidl -o autofill_service_stub mv autofill_service_stub.h ./service_lib/ mv autofill_service_stub.c ./service_lib/ @@ -116,7 +133,9 @@ export FFLAGS+=" -DTIZEN_DEBUG_ENABLE -fvisibility=hidden" rm -rf CMakeFiles rm -rf CMakeCache.txt MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ + -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES + make %{?jobs:-j%jobs} %install @@ -126,6 +145,9 @@ rm -rf %{buildroot} %post /sbin/ldconfig +%post -n org.tizen.autofill-daemon +mkdir -p %{TZ_SYS_RO_APP}/org.tizen.autofill-daemon + %postun -p /sbin/ldconfig @@ -170,3 +192,8 @@ rm -rf %{buildroot} %{_includedir}/autofill_manager*.h %{_libdir}/pkgconfig/capi-ui-autofill-manager.pc %{_libdir}/libcapi-ui-autofill-manager.so + +%files -n org.tizen.autofill-daemon +%manifest server/org.tizen.autofill-daemon.manifest +%{TZ_SYS_RO_PACKAGES}/org.tizen.autofill-daemon.xml +%{TZ_SYS_RO_APP}/org.tizen.autofill-daemon/* diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt new file mode 100644 index 0000000..aba710e --- /dev/null +++ b/server/CMakeLists.txt @@ -0,0 +1,43 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(autofill-daemon C) + +SET(SRCS + main.c + autofill_config.c + autofill_stub.c + autofill_manager_stub.c + autofill_service_proxy.c +) + +pkg_check_modules(pkgs_daemon REQUIRED + dlog + capi-appfw-service-application + rpc-port + glib-2.0 + capi-appfw-app-manager + capi-appfw-preference + eina +) + +INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include) + +FOREACH(flag ${pkgs_daemon_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie") + +FIND_PROGRAM(UNAME NAMES uname) +EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") +IF("${ARCH}" STREQUAL "arm") + ADD_DEFINITIONS("-DTARGET") + MESSAGE("add -DTARGET") +ENDIF("${ARCH}" STREQUAL "arm") + +ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) + +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_daemon_LDFLAGS}) + +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${TZ_SYS_RO_APP}/org.tizen.${PROJECT_NAME}/bin/) +INSTALL(FILES ${CMAKE_BINARY_DIR}/server/org.tizen.${PROJECT_NAME}.xml DESTINATION ${TZ_SYS_RO_PACKAGES}) diff --git a/server/org.tizen.autofill-daemon.manifest b/server/org.tizen.autofill-daemon.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/server/org.tizen.autofill-daemon.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/server/org.tizen.autofill-daemon.xml b/server/org.tizen.autofill-daemon.xml new file mode 100644 index 0000000..36ad5ac --- /dev/null +++ b/server/org.tizen.autofill-daemon.xml @@ -0,0 +1,14 @@ + + + + Jihoon Kim + autofill-daemon + + + + + + http://tizen.org/privilege/appmanager.launch + http://tizen.org/privilege/datasharing + + -- 2.7.4