From 25752f066a4c59969839c1163823e12571751729 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 19 Nov 2018 15:58:45 +0900 Subject: [PATCH] Change daemon from org.tizen.autofill-daemon to org.tizen.autofilld org.tizen.autofilld is located in other git repository for ABS build. autofill-daemon is moved into other repository. Change-Id: I2fae45317dea4c5af24dd06a0860e943366da91a Signed-off-by: Jihoon Kim --- 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, 3 insertions(+), 100 deletions(-) delete mode 100644 server/CMakeLists.txt delete mode 100644 server/org.tizen.autofill-daemon.manifest delete mode 100644 server/org.tizen.autofill-daemon.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index ce0756d..71a1b45 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,11 +32,3 @@ 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 52cfeb0..6318d3d 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.autofill-daemon" +#define AUTOFILL_DAEMON_APP_ID "org.tizen.autofilld" #ifdef LOG_TAG #undef LOG_TAG diff --git a/manager/autofill_manager.c b/manager/autofill_manager.c index a047ba1..e2becfc 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.autofill-daemon" +#define AUTOFILL_DAEMON_APP_ID "org.tizen.autofilld" #ifdef LOG_TAG #undef LOG_TAG diff --git a/packaging/capi-ui-autofill.spec b/packaging/capi-ui-autofill.spec index 049084d..aabba06 100644 --- a/packaging/capi-ui-autofill.spec +++ b/packaging/capi-ui-autofill.spec @@ -87,15 +87,6 @@ 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 @@ -103,14 +94,6 @@ 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/ @@ -133,9 +116,7 @@ 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} \ - -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES - +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} %install @@ -145,9 +126,6 @@ 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 @@ -192,8 +170,3 @@ mkdir -p %{TZ_SYS_RO_APP}/org.tizen.autofill-daemon %{_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 deleted file mode 100644 index aba710e..0000000 --- a/server/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 017d22d..0000000 --- a/server/org.tizen.autofill-daemon.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/server/org.tizen.autofill-daemon.xml b/server/org.tizen.autofill-daemon.xml deleted file mode 100644 index 36ad5ac..0000000 --- a/server/org.tizen.autofill-daemon.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - Jihoon Kim - autofill-daemon - - - - - - http://tizen.org/privilege/appmanager.launch - http://tizen.org/privilege/datasharing - - -- 2.7.4