From 9f0e658cd2f4a1c6123f17ae15bc1ed06e2f64ae Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 7 Feb 2020 16:04:58 +0900 Subject: [PATCH] Rename from companion to receiver Change-Id: I16e037853f89dd05363e49b56da7d017685357d7 Signed-off-by: Jihoon Kim --- CMakeLists.txt | 2 +- packaging/capi-ui-sticker.spec | 4 ++-- {companion => receiver}/CMakeLists.txt | 8 ++++---- {companion => receiver}/inc/ft.h | 2 +- {companion => receiver}/inc/log.h | 0 {companion => receiver}/inc/main.h | 4 ++-- {companion => receiver}/inc/sticker_info.h | 4 ++-- {companion => receiver}/org.tizen.sticker-consumer.manifest | 0 receiver/org.tizen.sticker-receiver.manifest | 5 +++++ {companion => receiver}/res/xml/accessoryservices.xml | 4 ++-- {companion => receiver}/src/ft.cpp | 0 {companion => receiver}/src/main.cpp | 0 {companion => receiver}/src/sticker_info.cpp | 0 {companion => receiver}/tizen-manifest.xml | 6 +++--- 14 files changed, 22 insertions(+), 17 deletions(-) rename {companion => receiver}/CMakeLists.txt (74%) rename {companion => receiver}/inc/ft.h (95%) rename {companion => receiver}/inc/log.h (100%) rename {companion => receiver}/inc/main.h (67%) rename {companion => receiver}/inc/sticker_info.h (80%) rename {companion => receiver}/org.tizen.sticker-consumer.manifest (100%) create mode 100644 receiver/org.tizen.sticker-receiver.manifest rename {companion => receiver}/res/xml/accessoryservices.xml (81%) rename {companion => receiver}/src/ft.cpp (100%) rename {companion => receiver}/src/main.cpp (100%) rename {companion => receiver}/src/sticker_info.cpp (100%) rename {companion => receiver}/tizen-manifest.xml (79%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b03a770..e2f43a7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ ADD_SUBDIRECTORY(sticker-parser) IF(DEFINED COMPANION_MODE) ## Sticker companion service ## -ADD_SUBDIRECTORY(companion) +ADD_SUBDIRECTORY(receiver) ENDIF() ## config ## diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 3db2912..d14e2c0 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -47,7 +47,7 @@ Group: Graphics & UI Framework/Input Requires: %{name} = %{version}-%{release} %if 0%{?sec_product_feature_profile_wearable} -%define _companion_app_name org.tizen.sticker-consumer +%define _companion_app_name org.tizen.sticker-receiver %package -n %{_companion_app_name} Summary: Sticker companion service @@ -167,7 +167,7 @@ chsmack -a "System::Shared" %{TZ_SYS_SHARE}/sticker-data %if 0%{?sec_product_feature_profile_wearable} %files -n %{_companion_app_name} -%manifest companion/%{_companion_app_name}.manifest +%manifest receiver/%{_companion_app_name}.manifest %{TZ_SYS_RO_PACKAGES}/%{_companion_app_name}.xml %{TZ_SYS_RO_APP}/%{_companion_app_name}/* %endif diff --git a/companion/CMakeLists.txt b/receiver/CMakeLists.txt similarity index 74% rename from companion/CMakeLists.txt rename to receiver/CMakeLists.txt index e326999..3d1e6a9 100644 --- a/companion/CMakeLists.txt +++ b/receiver/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(sticker-consumer CXX) +PROJECT(sticker-receiver CXX) SET(SRCS src/main.cpp @@ -15,7 +15,7 @@ pkg_check_modules(pkgs_test REQUIRED sap-client-stub-api ) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/companion/inc) +INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/receiver/inc) FOREACH(flag ${pkgs_test_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") @@ -39,5 +39,5 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_test_LDFLAGS} capi-ui-sticker-provider) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${TZ_SYS_RO_APP}/org.tizen.${PROJECT_NAME}/bin) -INSTALL(FILES ${CMAKE_BINARY_DIR}/companion/tizen-manifest.xml DESTINATION ${TZ_SYS_RO_PACKAGES} RENAME org.tizen.${PROJECT_NAME}.xml) -INSTALL(FILES ${CMAKE_BINARY_DIR}/companion/res/xml/accessoryservices.xml DESTINATION ${TZ_SYS_RO_APP}/org.tizen.${PROJECT_NAME}/res/xml) +INSTALL(FILES ${CMAKE_BINARY_DIR}/receiver/tizen-manifest.xml DESTINATION ${TZ_SYS_RO_PACKAGES} RENAME org.tizen.${PROJECT_NAME}.xml) +INSTALL(FILES ${CMAKE_BINARY_DIR}/receiver/res/xml/accessoryservices.xml DESTINATION ${TZ_SYS_RO_APP}/org.tizen.${PROJECT_NAME}/res/xml) diff --git a/companion/inc/ft.h b/receiver/inc/ft.h similarity index 95% rename from companion/inc/ft.h rename to receiver/inc/ft.h index 9aa4b9b..b64fa8d 100644 --- a/companion/inc/ft.h +++ b/receiver/inc/ft.h @@ -19,7 +19,7 @@ #define __FT_H__ #if !defined(PACKAGE) -#define PACKAGE "org.tizen.sticker-consumer" +#define PACKAGE "org.tizen.sticker-receiver" #endif #define GRP_MAIN "main" diff --git a/companion/inc/log.h b/receiver/inc/log.h similarity index 100% rename from companion/inc/log.h rename to receiver/inc/log.h diff --git a/companion/inc/main.h b/receiver/inc/main.h similarity index 67% rename from companion/inc/main.h rename to receiver/inc/main.h index 361bdd5..473ac68 100644 --- a/companion/inc/main.h +++ b/receiver/inc/main.h @@ -5,10 +5,10 @@ #ifndef __MAIN_H__ #define __MAIN_H__ -#define TAG "STICKER_CONSUMER" +#define TAG "STICKER_RECEIVER" #if !defined(PACKAGE) -#define PACKAGE "org.tizen.sticker-consumer" +#define PACKAGE "org.tizen.sticker-receiver" #endif #endif /* __MAIN_H__ */ diff --git a/companion/inc/sticker_info.h b/receiver/inc/sticker_info.h similarity index 80% rename from companion/inc/sticker_info.h rename to receiver/inc/sticker_info.h index b06c885..e65c244 100644 --- a/companion/inc/sticker_info.h +++ b/receiver/inc/sticker_info.h @@ -1,10 +1,10 @@ #ifndef __STICKER_INFO_H__ #define __STICKER_INFO_H__ -#define TAG "STICKER_CONSUMER" +#define TAG "STICKER_RECEIVER" void insert_sticker_data(const char *filepath, const char *keyword, const char *group, const char *desc); void create_sticker_provider_handle(void); void destroy_sticker_provider_handle(void); -#endif /* __STICKER_INF_H__ */ \ No newline at end of file +#endif /* __STICKER_INF_H__ */ diff --git a/companion/org.tizen.sticker-consumer.manifest b/receiver/org.tizen.sticker-consumer.manifest similarity index 100% rename from companion/org.tizen.sticker-consumer.manifest rename to receiver/org.tizen.sticker-consumer.manifest diff --git a/receiver/org.tizen.sticker-receiver.manifest b/receiver/org.tizen.sticker-receiver.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/receiver/org.tizen.sticker-receiver.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/companion/res/xml/accessoryservices.xml b/receiver/res/xml/accessoryservices.xml similarity index 81% rename from companion/res/xml/accessoryservices.xml rename to receiver/res/xml/accessoryservices.xml index 6419f03..fee8e4c 100644 --- a/companion/res/xml/accessoryservices.xml +++ b/receiver/res/xml/accessoryservices.xml @@ -1,8 +1,8 @@ - + - + - - + + -- 2.7.4