TizenRefApp-5621 [Email] Congurate CMake files to build all project source file as...

Change-Id: I770597b16e4f1d966e8d59313e7cbe8daf64efe5

diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index 5c30282..b57a10c 100644 (file)
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -29,6 +29,10 @@ IF(${ENABLE_ATTACH_PANEL})
        ADD_DEFINITIONS("-DATTACH_PANEL_FEATURE")
 ENDIF(${ENABLE_ATTACH_PANEL})
 
+IF(${BUILD_SHARED_LIBS})
+       ADD_DEFINITIONS("-DSHARED_MODULES_FEATURE")
+ENDIF(${BUILD_SHARED_LIBS})
+
 # Set definitions to be used to compile edcs
 SET(EDJE_CC_DEFINITIONS "")
 
@@ -45,7 +49,7 @@ IF("${ARCH}" STREQUAL "armv7l")
        SET(CMAKE_C_FLAGS_RELEASE "-mabi=aapcs-linux -O2")
 ENDIF("${ARCH}" STREQUAL "armv7l")
 
-SET(BASE_C_FLAGS "${CMAKE_C_FLAGS} -fdata-sections -ffunction-sections -Wl,--gc-sections -Werror")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdata-sections -ffunction-sections -Wl,--gc-sections -Werror")
 
 INCLUDE(FindPkgConfig)
 
@@ -77,15 +81,36 @@ SET(PROJECT_PO_DIR "${PROJECT_RESOURCES_DIR}/po")
 SET(PROJECT_COMMON_INCLUDE "${PROJECT_COMMON_DIR}/inc")
 INCLUDE_DIRECTORIES(${PROJECT_COMMON_INCLUDE})
 
+SET(email-required-pkgs ecore glib-2.0 gobject-2.0 email-service storage
+       contacts-service2 capi-content-media-content dlog elementary evas eina edje capi-base-utils-i18n
+       accounts-svc capi-network-connection efl-extension capi-content-mime-type capi-system-system-settings
+       capi-appfw-application capi-appfw-preference vconf feedback notification gio-2.0 capi-media-image-util
+       libpng capi-media-metadata-extractor libexif libxml-2.0)
+
+IF(${TIZEN_2_4})
+       SET(email-required-pkgs ${email-required-pkgs} ewebkit2)
+ELSE(${TIZEN_2_4})
+       SET(email-required-pkgs ${email-required-pkgs} chromium-efl libtzplatform-config)
+ENDIF(${TIZEN_2_4})
+
+IF(${ENABLE_ATTACH_PANEL})
+       SET(email-required-pkgs ${email-required-pkgs} attach-panel)
+ENDIF(${ENABLE_ATTACH_PANEL})
+
+pkg_check_modules(pkgs-email REQUIRED ${email-required-pkgs})
+
+FOREACH(flag ${pkgs-email_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
+
 # Add your submodule directory name
 
 ADD_SUBDIRECTORY(po)
 
-SET(CMAKE_C_FLAGS "${BASE_C_FLAGS} -fpic")
-
 ADD_SUBDIRECTORY(email-common)
-ADD_SUBDIRECTORY(modules)
 
-SET(CMAKE_C_FLAGS ${BASE_C_FLAGS})
+ADD_SUBDIRECTORY(modules)
 
 ADD_SUBDIRECTORY(main)

diff --git a/CMake/email-common/CMakeLists.txt b/CMake/email-common/CMakeLists.txt
index 60a9cd1..768c23d 100644 (file)
--- a/CMake/email-common/CMakeLists.txt
+++ b/CMake/email-common/CMakeLists.txt
@@ -15,48 +15,15 @@ SET(SRCS-common
        ${PROJECT_COMMON_DIR}/src/email-color-box.c
 )
 
-IF(${TIZEN_2_4})
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic")
 
-IF(${ENABLE_ATTACH_PANEL})
-       SET(email-required-pkgs ecore glib-2.0 gobject-2.0 email-service storage
-               contacts-service2 capi-content-media-content dlog elementary evas eina edje capi-base-utils-i18n
-               accounts-svc capi-network-connection efl-extension capi-content-mime-type capi-system-system-settings
-               capi-appfw-application ewebkit2 capi-appfw-preference vconf attach-panel feedback)
-ELSE(${ENABLE_ATTACH_PANEL})
-       SET(email-required-pkgs ecore glib-2.0 gobject-2.0 email-service storage
-               contacts-service2 capi-content-media-content dlog elementary evas eina edje capi-base-utils-i18n
-               accounts-svc capi-network-connection efl-extension capi-content-mime-type capi-system-system-settings
-               capi-appfw-application ewebkit2 capi-appfw-preference vconf feedback)
-ENDIF(${ENABLE_ATTACH_PANEL})
-
-ELSE(${TIZEN_2_4})
-
-IF(${ENABLE_ATTACH_PANEL})
-       SET(email-required-pkgs ecore glib-2.0 gobject-2.0 email-service storage
-               contacts-service2 capi-content-media-content dlog elementary evas eina edje capi-base-utils-i18n
-               accounts-svc capi-network-connection efl-extension capi-content-mime-type capi-system-system-settings
-               capi-appfw-application chromium-efl capi-appfw-preference vconf attach-panel feedback libtzplatform-config)
-ELSE(${ENABLE_ATTACH_PANEL})
-       SET(email-required-pkgs ecore glib-2.0 gobject-2.0 email-service storage
-               contacts-service2 capi-content-media-content dlog elementary evas eina edje capi-base-utils-i18n
-               accounts-svc capi-network-connection efl-extension capi-content-mime-type capi-system-system-settings
-               capi-appfw-application chromium-efl capi-appfw-preference vconf feedback libtzplatform-config)
-ENDIF(${ENABLE_ATTACH_PANEL})
-
-ENDIF(${TIZEN_2_4})
-
-
-pkg_check_modules(pkgs-common REQUIRED "${email-required-pkgs}")
-
-FOREACH(flag ${pkgs-common_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS-common})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} dl ${pkgs-common_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+IF(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS-common})
+       TARGET_LINK_LIBRARIES(${PROJECT_NAME} dl ${pkgs-email_LDFLAGS})
+       INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+ELSE(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS-common})
+ENDIF(${BUILD_SHARED_LIBS})
 
 ADD_CUSTOM_COMMAND(
                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/email-common-theme.edj
@@ -76,4 +43,3 @@ ADD_CUSTOM_COMMAND(
 )
 ADD_CUSTOM_TARGET(email-common-theme.edj ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/email-common-theme.edj)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/email-common-theme.edj DESTINATION ${EDJDIR})
-

diff --git a/CMake/main/CMakeLists.txt b/CMake/main/CMakeLists.txt
index 1691fc2..9a1f284 100644 (file)
--- a/CMake/main/CMakeLists.txt
+++ b/CMake/main/CMakeLists.txt
@@ -5,20 +5,16 @@ SET(VENDOR "tizen")
 SET(PACKAGE ${PROJECT_NAME})
 SET(PKGNAME "org.${VENDOR}.${PACKAGE}")
 
-pkg_check_modules(pkgs-email REQUIRED elementary email-service accounts-svc
-       bundle dlog ecore-input contacts-service2 efl-extension gio-2.0 capi-base-utils-i18n capi-system-system-settings
-       capi-appfw-application)
-
-FOREACH(flag ${pkgs-email_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fpie")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpie")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
-ADD_SUBDIRECTORY(email)
-ADD_SUBDIRECTORY(email-setting)
-ADD_SUBDIRECTORY(email-composer)
+IF(${BUILD_SHARED_LIBS})
+       ADD_SUBDIRECTORY(email-single)
+       ADD_SUBDIRECTORY(email-setting)
+       ADD_SUBDIRECTORY(email-composer)
+ELSE(${BUILD_SHARED_LIBS})
+       ADD_SUBDIRECTORY(email)
+ENDIF(${BUILD_SHARED_LIBS})
 
 # install manifest file
 INSTALL(FILES ${PROJECT_ROOT_DIR}/${PKGNAME}.xml DESTINATION ${PACKAGEDIR})

diff --git a/CMake/main/email-composer/CMakeLists.txt b/CMake/main/email-composer/CMakeLists.txt
index 95e7914..440aa54 100644 (file)
--- a/CMake/main/email-composer/CMakeLists.txt
+++ b/CMake/main/email-composer/CMakeLists.txt
@@ -6,6 +6,6 @@ SET(SRCS ${PROJECT_FILES_DIR}/main/email-main.c)
 ADD_DEFINITIONS("-DAPP_MODULE_TYPE=EMAIL_MODULE_COMPOSER")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-email_LDFLAGS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})

diff --git a/CMake/main/email-setting/CMakeLists.txt b/CMake/main/email-setting/CMakeLists.txt
index 184b82d..2a07acf 100644 (file)
--- a/CMake/main/email-setting/CMakeLists.txt
+++ b/CMake/main/email-setting/CMakeLists.txt
@@ -6,6 +6,6 @@ SET(SRCS ${PROJECT_FILES_DIR}/main/email-main.c)
 ADD_DEFINITIONS("-DAPP_MODULE_TYPE=EMAIL_MODULE_SETTING")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-email_LDFLAGS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})

diff --git a/CMake/main/email-single/CMakeLists.txt b/CMake/main/email-single/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6d79971
--- /dev/null
+++ b/CMake/main/email-single/CMakeLists.txt
@@ -0,0 +1,12 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(email C)
+
+SET(SRCS ${PROJECT_FILES_DIR}/main/email-main.c)
+
+ADD_DEFINITIONS("-DAPP_MODULE_TYPE=EMAIL_MODULE_MAILBOX")
+ADD_DEFINITIONS("-DAPP_USE_SIG")
+
+ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common)
+
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})

diff --git a/CMake/main/email/CMakeLists.txt b/CMake/main/email/CMakeLists.txt
index 123fb00..8729e05 100644 (file)
--- a/CMake/main/email/CMakeLists.txt
+++ b/CMake/main/email/CMakeLists.txt
@@ -3,10 +3,18 @@ PROJECT(email C)
 
 SET(SRCS ${PROJECT_FILES_DIR}/main/email-main.c)
 
-ADD_DEFINITIONS("-DAPP_MODULE_TYPE=EMAIL_MODULE_MAILBOX")
 ADD_DEFINITIONS("-DAPP_USE_SIG")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-email_LDFLAGS})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME}
+       email-common
+       email-account-module
+       email-composer-module
+       email-filter-module
+       email-mailbox-module
+       email-setting-module
+       email-viewer-module
+       email-common
+       ${pkgs-email_LDFLAGS})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})

diff --git a/CMake/modules/CMakeLists.txt b/CMake/modules/CMakeLists.txt
index 903f746..9035df1 100644 (file)
--- a/CMake/modules/CMakeLists.txt
+++ b/CMake/modules/CMakeLists.txt
@@ -1,5 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic")
+
 ADD_SUBDIRECTORY(email-mailbox-module)
 ADD_SUBDIRECTORY(email-viewer-module)
 ADD_SUBDIRECTORY(email-composer-module)

diff --git a/CMake/modules/email-account-module/CMakeLists.txt b/CMake/modules/email-account-module/CMakeLists.txt
index ce122db..db8f529 100644 (file)
--- a/CMake/modules/email-account-module/CMakeLists.txt
+++ b/CMake/modules/email-account-module/CMakeLists.txt
@@ -13,20 +13,13 @@ SET(SRCS
 
 INCLUDE_DIRECTORIES(${CURRENT_SOURCE_DIR}/inc)
 
-SET(email-required-pkgs REQUIRED elementary email-service bundle dlog capi-appfw-application contacts-service2 notification
-       efl-extension gio-2.0 capi-system-system-settings)
-
-pkg_check_modules(pkgs-account REQUIRED "${email-required-pkgs}")
-
-FOREACH(flag ${pkgs-account_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-account_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+IF(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+       TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-email_LDFLAGS})
+       INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+ELSE(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS})
+ENDIF(${BUILD_SHARED_LIBS})
 
 ADD_CUSTOM_COMMAND(
                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/email-account.edj

diff --git a/CMake/modules/email-composer-module/CMakeLists.txt b/CMake/modules/email-composer-module/CMakeLists.txt
index 2830c97..7b05968 100644 (file)
--- a/CMake/modules/email-composer-module/CMakeLists.txt
+++ b/CMake/modules/email-composer-module/CMakeLists.txt
@@ -27,30 +27,13 @@ SET(SRCS
 
 INCLUDE_DIRECTORIES(${CURRENT_SOURCE_DIR}/inc)
 
-IF(${TIZEN_2_4})
-SET(email-required-pkgs ecore glib-2.0 gobject-2.0 gio-2.0 elementary capi-appfw-application
-       capi-media-metadata-extractor capi-media-image-util notification evas dlog email-service contacts-service2
-       libexif ewebkit2 bundle efl-extension capi-system-system-settings
-       capi-network-connection capi-network-wifi libpng storage capi-content-media-content)
-ELSE(${TIZEN_2_4})
-SET(email-required-pkgs ecore glib-2.0 gobject-2.0 gio-2.0 elementary capi-appfw-application
-       capi-media-metadata-extractor capi-media-image-util notification evas dlog email-service contacts-service2
-       libexif chromium-efl bundle efl-extension capi-system-system-settings
-       capi-network-connection capi-network-wifi libpng storage capi-content-media-content)
-ENDIF(${TIZEN_2_4})
-
-pkg_check_modules(pkgs-composer REQUIRED "${email-required-pkgs}")
-
-FOREACH(flag ${pkgs-composer_CFLAGS})
-       SET(EXTRA_FLAGS "${EXTRA_FLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_FLAGS}")
-#SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete")
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common rt ${pkgs-composer_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+IF(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+       TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common rt ${pkgs-email_LDFLAGS})
+       INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+ELSE(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS})
+ENDIF(${BUILD_SHARED_LIBS})
 
 ADD_CUSTOM_COMMAND(
                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/email-composer-view.edj

diff --git a/CMake/modules/email-filter-module/CMakeLists.txt b/CMake/modules/email-filter-module/CMakeLists.txt
index e323787..fd8c08b 100644 (file)
--- a/CMake/modules/email-filter-module/CMakeLists.txt
+++ b/CMake/modules/email-filter-module/CMakeLists.txt
@@ -12,29 +12,13 @@ SET(SRCS
 
 INCLUDE_DIRECTORIES(${CURRENT_SOURCE_DIR}/inc)
 
-pkg_check_modules(pkgs-filter REQUIRED
-       ecore
-       glib-2.0
-       gobject-2.0
-       email-service
-       dlog
-       elementary
-       capi-appfw-application
-       notification
-       contacts-service2
-       efl-extension
-       capi-system-system-settings
-)
-
-FOREACH(flag ${pkgs-filter_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-filter_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+IF(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+       TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-email_LDFLAGS})
+       INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+ELSE(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS})
+ENDIF(${BUILD_SHARED_LIBS})
 
 ADD_CUSTOM_COMMAND(
        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/email-filter.edj
@@ -44,4 +28,5 @@ ADD_CUSTOM_COMMAND(
        ${PROJECT_EDC_DIR}/filter/email-filter-address-edit-view.edc)
 
 ADD_CUSTOM_TARGET(email-filter.edj ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/email-filter.edj)
+
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/email-filter.edj DESTINATION ${EDJDIR})

diff --git a/CMake/modules/email-mailbox-module/CMakeLists.txt b/CMake/modules/email-mailbox-module/CMakeLists.txt
index 3fee2c7..613552e 100644 (file)
--- a/CMake/modules/email-mailbox-module/CMakeLists.txt
+++ b/CMake/modules/email-mailbox-module/CMakeLists.txt
@@ -21,20 +21,13 @@ SET(SRCS
 
 INCLUDE_DIRECTORIES(${CURRENT_SOURCE_DIR}/inc)
 
-SET(email-required-pkgs elementary email-service glib-2.0 gio-2.0 bundle dlog capi-base-utils-i18n
-       capi-appfw-application contacts-service2 notification capi-system-system-settings efl-extension)
-
-pkg_check_modules(pkgs-mailbox REQUIRED "${email-required-pkgs}")
-
-FOREACH(flag ${pkgs-mailbox_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-mailbox_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+IF(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+       TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-email_LDFLAGS})
+       INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+ELSE(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS})
+ENDIF(${BUILD_SHARED_LIBS})
 
 ADD_CUSTOM_COMMAND(
                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/email-mailbox.edj

diff --git a/CMake/modules/email-setting-module/CMakeLists.txt b/CMake/modules/email-setting-module/CMakeLists.txt
index dc1f07e..bfb21f3 100644 (file)
--- a/CMake/modules/email-setting-module/CMakeLists.txt
+++ b/CMake/modules/email-setting-module/CMakeLists.txt
@@ -21,21 +21,13 @@ SET(SRCS
 
 INCLUDE_DIRECTORIES(${CURRENT_SOURCE_DIR}/inc)
 
-SET(email-required-pkgs ecore glib-2.0 gobject-2.0 elementary notification email-service
-       bundle dlog gio-2.0 capi-appfw-application contacts-service2 capi-base-utils-i18n
-       accounts-svc capi-system-system-settings efl-extension libxml-2.0 capi-media-metadata-extractor)
-
-pkg_check_modules(pkgs-setting REQUIRED "${email-required-pkgs}")
-       
-FOREACH(flag ${pkgs-setting_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-setting_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+IF(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+       TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-email_LDFLAGS})
+       INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+ELSE(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS})
+ENDIF(${BUILD_SHARED_LIBS})
 
 ADD_CUSTOM_COMMAND(
                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/email-setting-theme.edj

diff --git a/CMake/modules/email-viewer-module/CMakeLists.txt b/CMake/modules/email-viewer-module/CMakeLists.txt
index 9a4f02a..de5ca6c 100644 (file)
--- a/CMake/modules/email-viewer-module/CMakeLists.txt
+++ b/CMake/modules/email-viewer-module/CMakeLists.txt
@@ -22,31 +22,13 @@ SET(SRCS
 
 INCLUDE_DIRECTORIES(${CURRENT_SOURCE_DIR}/inc)
 
-IF(${TIZEN_2_4})
-SET(email-required-pkgs elementary ecore glib-2.0 gobject-2.0
-       notification capi-media-metadata-extractor capi-media-image-util capi-content-media-content
-       email-service gio-2.0 capi-appfw-application ewebkit2 capi-system-system-settings
-       contacts-service2 bundle dlog efl-extension storage capi-base-utils-i18n)
-ELSE(${TIZEN_2_4})
-SET(email-required-pkgs elementary ecore glib-2.0 gobject-2.0
-       notification capi-media-metadata-extractor capi-media-image-util capi-content-media-content
-       email-service gio-2.0 capi-appfw-application chromium-efl capi-system-system-settings
-       contacts-service2 bundle dlog efl-extension storage capi-base-utils-i18n)
-ENDIF(${TIZEN_2_4})
-
-pkg_check_modules(pkgs-viewer REQUIRED "${email-required-pkgs}")
-
-FOREACH(flag ${pkgs-viewer_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-#ADD_DEFINITIONS("-D_WEBKIT_CONSOLE_MESSAGE_LOG")
-
-ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-viewer_LDFLAGS})
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+IF(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
+       TARGET_LINK_LIBRARIES(${PROJECT_NAME} email-common ${pkgs-email_LDFLAGS})
+       INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR})
+ELSE(${BUILD_SHARED_LIBS})
+       ADD_LIBRARY(${PROJECT_NAME} STATIC ${SRCS})
+ENDIF(${BUILD_SHARED_LIBS})
 
 ADD_CUSTOM_COMMAND(
                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/email-viewer.edj

diff --git a/Project-Files/common/src/email-module-core.c b/Project-Files/common/src/email-module-core.c
index c86b9d2..d5c3bde 100644 (file)
--- a/Project-Files/common/src/email-module-core.c
+++ b/Project-Files/common/src/email-module-core.c
@@ -70,7 +70,9 @@ typedef struct {
  *
  * @return name of the .so file or NULL on error
  */
+#ifdef SHARED_MODULES_FEATURE
 static const char *_get_module_lib_name(email_module_type_e module_type);
+#endif
 
 /**
  * email_module_mgr
@@ -476,6 +478,7 @@ static void _email_view_back_btn_cb(void *data, Evas_Object *obj, void *event_in
  * utils
  */
 
+#ifdef SHARED_MODULES_FEATURE
 const char *_get_module_lib_name(email_module_type_e module_type)
 {
        switch (module_type) {
@@ -489,6 +492,7 @@ const char *_get_module_lib_name(email_module_type_e module_type)
                return NULL;
        }
 }
+#endif
 
 /**
  * email_module_mgr
@@ -718,6 +722,7 @@ bool email_module_mgr_is_in_compressed_mode()
        return (evas_object_size_hint_display_mode_get(MODULE_MGR.navi) == EVAS_DISPLAY_MODE_COMPRESS);
 }
 
+#ifdef SHARED_MODULES_FEATURE
 email_module_t *_email_module_mgr_alloc_module(email_module_type_e module_type)
 {
        debug_enter();
@@ -773,6 +778,29 @@ email_module_t *_email_module_mgr_alloc_module(email_module_type_e module_type)
        debug_leave();
        return module;
 }
+#else
+email_module_t *mailbox_module_alloc();
+email_module_t *viewer_module_alloc();
+email_module_t *composer_module_alloc();
+email_module_t *account_module_alloc();
+email_module_t *setting_module_alloc();
+email_module_t *filter_module_alloc();
+
+email_module_t *_email_module_mgr_alloc_module(email_module_type_e module_type)
+{
+       switch (module_type) {
+       case EMAIL_MODULE_MAILBOX:      return mailbox_module_alloc();
+       case EMAIL_MODULE_VIEWER:       return viewer_module_alloc();
+       case EMAIL_MODULE_COMPOSER:     return composer_module_alloc();
+       case EMAIL_MODULE_ACCOUNT:      return account_module_alloc();
+       case EMAIL_MODULE_SETTING:      return setting_module_alloc();
+       case EMAIL_MODULE_FILTER:       return filter_module_alloc();
+       default:
+               debug_error("Unknown module type: %d", module_type);
+               return NULL;
+       }
+}
+#endif
 
 email_module_h _email_module_mgr_create_module(email_module_type_e module_type, app_control_h params,
                email_module_listener_t *listener, email_module_t *parent)

diff --git a/Project-Files/main/email-main.c b/Project-Files/main/email-main.c
index fc822a7..06b1ee4 100644 (file)
--- a/Project-Files/main/email-main.c
+++ b/Project-Files/main/email-main.c
@@ -485,7 +485,11 @@ static bool _app_create_module(app_data_t *ad, app_control_h params)
        listener.result_cb = _app_module_result_cb;
        listener.destroy_request_cb = _app_module_destroy_request_cb;
 
+#ifdef SHARED_MODULES_FEATURE
        email_module_h module = email_module_mgr_create_root_module(APP_MODULE_TYPE, params, &listener);
+#else
+       email_module_h module = email_module_mgr_create_root_module(EMAIL_MODULE_MAILBOX, params, &listener);
+#endif
        if (!module) {
                debug_error("Module creation failed.");
                return false;

diff --git a/Project-Files/modules/account/src/email-account.c b/Project-Files/modules/account/src/email-account.c
index ff82eb4..80fd526 100644 (file)
--- a/Project-Files/modules/account/src/email-account.c
+++ b/Project-Files/modules/account/src/email-account.c
@@ -368,7 +368,11 @@ static void _account_update(email_view_t *self, int flags)
        }
 }
 
+#ifdef SHARED_MODULES_FEATURE
 EMAIL_API email_module_t *email_module_alloc()
+#else
+email_module_t *account_module_alloc()
+#endif
 {
        debug_enter();
 

diff --git a/Project-Files/modules/composer/src/email-composer.c b/Project-Files/modules/composer/src/email-composer.c
index e67b8c1..d83e153 100644 (file)
--- a/Project-Files/modules/composer/src/email-composer.c
+++ b/Project-Files/modules/composer/src/email-composer.c
@@ -1732,7 +1732,11 @@ static void _composer_contacts_update_recp_info_for_recipients(EmailComposerUGD
 /*
  * Definition for exported functions
  */
+#ifdef SHARED_MODULES_FEATURE
 EMAIL_API email_module_t *email_module_alloc()
+#else
+email_module_t *composer_module_alloc()
+#endif
 {
        debug_enter();
 

diff --git a/Project-Files/modules/filter/src/email-filter.c b/Project-Files/modules/filter/src/email-filter.c
index adb0234..d52d4fe 100644 (file)
--- a/Project-Files/modules/filter/src/email-filter.c
+++ b/Project-Files/modules/filter/src/email-filter.c
@@ -140,7 +140,11 @@ static EmailFilterViewType _parse_option(EmailFilterUGD *ugd, app_control_h data
        return EMAIL_FILTER_VIEW_INVALID;
 }
 
+#ifdef SHARED_MODULES_FEATURE
 EMAIL_API email_module_t *email_module_alloc()
+#else
+email_module_t *filter_module_alloc()
+#endif
 {
        debug_enter();
 

diff --git a/Project-Files/modules/mailbox/src/email-mailbox.c b/Project-Files/modules/mailbox/src/email-mailbox.c
index 7528589..496b176 100644 (file)
--- a/Project-Files/modules/mailbox/src/email-mailbox.c
+++ b/Project-Files/modules/mailbox/src/email-mailbox.c
@@ -1285,7 +1285,11 @@ static void _mailbox_on_back_key(email_view_t *self)
  * Definition for exported functions
  */
 
+#ifdef SHARED_MODULES_FEATURE
 EMAIL_API email_module_t *email_module_alloc()
+#else
+email_module_t *mailbox_module_alloc()
+#endif
 {
        debug_enter();
 

diff --git a/Project-Files/modules/setting/src/email-setting.c b/Project-Files/modules/setting/src/email-setting.c
index 6910028..fdd8c78 100644 (file)
--- a/Project-Files/modules/setting/src/email-setting.c
+++ b/Project-Files/modules/setting/src/email-setting.c
@@ -53,7 +53,11 @@ static email_string_t EMAIL_SETTING_STRING_OK = {PACKAGE, "IDS_EMAIL_BUTTON_OK"}
 static email_string_t EMAIL_SETTING_STRING_FAILED_TO_START_EMAIL_APPLICATION = {PACKAGE, "IDS_EMAIL_POP_FAILED_TO_START_EMAIL_APPLICATION"};
 static email_string_t EMAIL_SETTING_STRING_WARNING = {PACKAGE, "IDS_ST_HEADER_WARNING"};
 
+#ifdef SHARED_MODULES_FEATURE
 EMAIL_API email_module_t *email_module_alloc()
+#else
+email_module_t *setting_module_alloc()
+#endif
 {
        debug_enter();
 

diff --git a/Project-Files/modules/viewer/src/email-viewer.c b/Project-Files/modules/viewer/src/email-viewer.c
index 38e43e3..80abd7e 100644 (file)
--- a/Project-Files/modules/viewer/src/email-viewer.c
+++ b/Project-Files/modules/viewer/src/email-viewer.c
@@ -122,7 +122,11 @@ static Eina_Bool _viewer_launch_email_application_cb(void *data);
 static int _construct_viewer_data(EmailViewerUGD *ug_data);
 static void _destroy_viewer(EmailViewerUGD *ug_data);
 
+#ifdef SHARED_MODULES_FEATURE
 EMAIL_API email_module_t *email_module_alloc()
+#else
+email_module_t *viewer_module_alloc()
+#endif
 {
        debug_enter();
 

diff --git a/SDK-3.0-Projects/email/tizen-manifest.xml b/SDK-3.0-Projects/email/tizen-manifest.xml
index 106aeb4..7efcc67 100644 (file)
--- a/SDK-3.0-Projects/email/tizen-manifest.xml
+++ b/SDK-3.0-Projects/email/tizen-manifest.xml
@@ -1,63 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" install-location="internal-only" package="org.tizen.email" version="1.0.0">
-    <label>Email</label>
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.email" version="0.9.34">
+    <profile name="mobile"/>
     <description>Email Application</description>
-    <ui-application appid="org.tizen.email" exec="email" indicatordisplay="true" launch_mode="single" mainapp="true" multiple="false" nodisplay="false" process-pool="false" taskmanage="true" type="capp">
-        <label>Email</label>
-        <label xml:lang="ar-ae">البريد الإلكتروني</label>
-        <label xml:lang="az-az">Elektron poçtlar</label>
-        <label xml:lang="bg-bg">Email</label>
-        <label xml:lang="ca-es">Correu electrònic</label>
-        <label xml:lang="cs-cz">E-mail</label>
-        <label xml:lang="da-dk">E-mail</label>
-        <label xml:lang="de-de">E-Mail</label>
-        <label xml:lang="el-gr">Email</label>
-        <label xml:lang="en-gb">Email</label>
-        <label xml:lang="en-ph">Email</label>
-        <label xml:lang="en-us">Email</label>
-        <label xml:lang="es-es">Correo electrónico</label>
-        <label xml:lang="es-us">Correo</label>
-        <label xml:lang="et-ee">E-post</label>
-        <label xml:lang="eu-es">Helbide elektronikoa</label>
-        <label xml:lang="fi-fi">Sähköposti</label>
-        <label xml:lang="fr-fr">E-mail</label>
-        <label xml:lang="fr-ca">Courriel</label>
-        <label xml:lang="ga-ie">R-phost</label>
-        <label xml:lang="gl-es">Correo electrónico</label>
-        <label xml:lang="hi-in">ईमेल</label>
-        <label xml:lang="hr-hr">Email</label>
-        <label xml:lang="hu-hu">E-mail</label>
-        <label xml:lang="hy-am">Էլ.փոստ</label>
-        <label xml:lang="is-is">Tölvupóstur</label>
-        <label xml:lang="it-it">E-mail</label>
-        <label xml:lang="ja-jp">Eメール</label>
-        <label xml:lang="ka-ge">ელ-ფოსტა</label>
-        <label xml:lang="kk-kz">Эл. пошта</label>
-        <label xml:lang="ko-kr">이메일</label>
-        <label xml:lang="lt-lt">El. paštas</label>
-        <label xml:lang="lv-lv">E-pasts</label>
-        <label xml:lang="mk-mk">Е-пошта</label>
-        <label xml:lang="nb-no">E-post</label>
-        <label xml:lang="nl-nl">E-mail</label>
-        <label xml:lang="pl-pl">E-mail</label>
-        <label xml:lang="pt-br">E-mail</label>
-        <label xml:lang="pt-pt">E-mail</label>
-        <label xml:lang="ro-ro">Email</label>
-        <label xml:lang="ru-ru">E-mail</label>
-        <label xml:lang="sk-sk">E-mail</label>
-        <label xml:lang="sl-si">E-pošta</label>
-        <label xml:lang="sr-rs">E-pošta</label>
-        <label xml:lang="sv-se">E-post</label>
-        <label xml:lang="tr-tr">E-posta</label>
-        <label xml:lang="uk-ua">Email</label>
-        <label xml:lang="uz-uz">E-pochta</label>
-        <label xml:lang="zh-cn">电子邮件</label>
-        <label xml:lang="zh-hk">電子郵件</label>
-        <label xml:lang="zh-tw">電子郵件</label>
+    <ui-application appid="org.tizen.email" exec="email" hw-acceleration="on" launch_mode="single" multiple="false" nodisplay="false" taskmanage="true" type="capp">
         <icon>org.tizen.email.png</icon>
-        <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow"/>
-    </ui-application>
-    <ui-application appid="org.tizen.email-composer" exec="email-composer" launch_mode="caller" multiple="true" nodisplay="true" process-pool="false" taskmanage="false" type="capp">
         <label>Email</label>
         <label xml:lang="ar-ae">البريد الإلكتروني</label>
         <label xml:lang="az-az">Elektron poçtlar</label>
@@ -109,61 +55,94 @@
         <label xml:lang="zh-cn">电子邮件</label>
         <label xml:lang="zh-hk">電子郵件</label>
         <label xml:lang="zh-tw">電子郵件</label>
-        <icon>org.tizen.email.png</icon>
-        <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow"/>
-        <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow/nodisplay"/>
-        <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/compose"/>
-               </application-service>
-        <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/compose"/>
-                       <uri name="mailto"/>
-               </application-service>
-        <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/share_text"/>
-               </application-service>
-        <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/share_text"/>
-                       <uri name="mailto"/>
-               </application-service>
-        <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/share"/>
-                       <mime name="*/*"/>
-               </application-service>
-        <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/share"/>
-                       <mime name="*/*"/>
-                       <uri name="mailto"/>
-               </application-service>
-        <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/multi_share"/>
-                       <mime name="*/*"/>
-               </application-service>
-        <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/multi_share"/>
-                       <mime name="*/*"/>
-                       <uri name="mailto"/>
-               </application-service>
-    </ui-application>
-    <ui-application appid="org.tizen.email-setting" exec="email-setting" launch_mode="caller" multiple="true" nodisplay="true" process-pool="false" taskmanage="false" type="capp">
-        <label>Email</label>
-        <icon>org.tizen.email.png</icon>
-        <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow"/>
-        <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow/nodisplay"/>
-        <application-service>
-                       <operation name="tizen-email://org.tizen.email/email_setting_notification"/>
-               </application-service>
-        <application-service>
-                       <operation name="tizen-email://org.tizen.email/email_setting_signature"/>
-               </application-service>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/compose"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/compose"/>
+            <uri name="mailto"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/share_text"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/share_text"/>
+            <uri name="mailto"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/share"/>
+            <mime name="*/*"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/share"/>
+            <uri name="mailto"/>
+            <mime name="*/*"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/multi_share"/>
+            <mime name="application/xhtml+xml"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/multi_share"/>
+            <uri name="mailto"/>
+            <mime name="*/*"/>
+        </app-control>
     </ui-application>
     <account>
-        <account-provider appid="org.tizen.email-setting" multiple-accounts-support="true" providerid="http://www.tizen.org/">
+        <account-provider appid="org.tizen.email" multiple-accounts-support="true" providerid="http://www.tizen.org/">
             <icon section="account">org.tizen.email.png</icon>
             <icon section="account-small">org.tizen.email.png</icon>
-            <label xml:lang="nl-nl">Email</label>
-            <label xml:lang="en-gb">Email</label>
             <label>Email</label>
+            <label xml:lang="ar-ae">البريد الإلكتروني</label>
+            <label xml:lang="az-az">Elektron poçtlar</label>
+            <label xml:lang="bg-bg">Email</label>
+            <label xml:lang="ca-es">Correu electrònic</label>
+            <label xml:lang="cs-cz">E-mail</label>
+            <label xml:lang="da-dk">E-mail</label>
+            <label xml:lang="de-de">E-Mail</label>
+            <label xml:lang="el-gr">Email</label>
+            <label xml:lang="en-gb">Email</label>
+            <label xml:lang="en-ph">Email</label>
+            <label xml:lang="en-us">Email</label>
+            <label xml:lang="es-es">Correo electrónico</label>
+            <label xml:lang="es-us">Correo</label>
+            <label xml:lang="et-ee">E-post</label>
+            <label xml:lang="eu-es">Helbide elektronikoa</label>
+            <label xml:lang="fi-fi">Sähköposti</label>
+            <label xml:lang="fr-fr">E-mail</label>
+            <label xml:lang="fr-ca">Courriel</label>
+            <label xml:lang="ga-ie">R-phost</label>
+            <label xml:lang="gl-es">Correo electrónico</label>
+            <label xml:lang="hi-in">ईमेल</label>
+            <label xml:lang="hr-hr">Email</label>
+            <label xml:lang="hu-hu">E-mail</label>
+            <label xml:lang="hy-am">Էլ.փոստ</label>
+            <label xml:lang="is-is">Tölvupóstur</label>
+            <label xml:lang="it-it">E-mail</label>
+            <label xml:lang="ja-jp">Eメール</label>
+            <label xml:lang="ka-ge">ელ-ფოსტა</label>
+            <label xml:lang="kk-kz">Эл. пошта</label>
+            <label xml:lang="ko-kr">이메일</label>
+            <label xml:lang="lt-lt">El. paštas</label>
+            <label xml:lang="lv-lv">E-pasts</label>
+            <label xml:lang="mk-mk">Е-пошта</label>
+            <label xml:lang="nb-no">E-post</label>
+            <label xml:lang="nl-nl">E-mail</label>
+            <label xml:lang="pl-pl">E-mail</label>
+            <label xml:lang="pt-br">E-mail</label>
+            <label xml:lang="pt-pt">E-mail</label>
+            <label xml:lang="ro-ro">Email</label>
+            <label xml:lang="ru-ru">E-mail</label>
+            <label xml:lang="sk-sk">E-mail</label>
+            <label xml:lang="sl-si">E-pošta</label>
+            <label xml:lang="sr-rs">E-pošta</label>
+            <label xml:lang="sv-se">E-post</label>
+            <label xml:lang="tr-tr">E-posta</label>
+            <label xml:lang="uk-ua">Email</label>
+            <label xml:lang="uz-uz">E-pochta</label>
+            <label xml:lang="zh-cn">电子邮件</label>
+            <label xml:lang="zh-hk">電子郵件</label>
+            <label xml:lang="zh-tw">電子郵件</label>
             <capability>http://tizen.org/account/capability/email</capability>
         </account-provider>
     </account>

diff --git a/org.tizen.email.xml b/org.tizen.email.xml
index 17a7b5b..9cd3f23 100644 (file)
--- a/org.tizen.email.xml
+++ b/org.tizen.email.xml
@@ -1,191 +1,163 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.email" api-version="2.4" version="0.9.34" install-location="internal-only">
-       <label>Email</label>
-       <author email="minnsoo.kim@samsung.com" href="www.samsung.com">Minsoo Kim</author>
-       <description>Email Application</description>
-       <ui-application appid="org.tizen.email" exec="/usr/apps/org.tizen.email/bin/email" nodisplay="false" taskmanage="true" multiple="false" type = "capp" mainapp = "true"
-               indicatordisplay="true" process-pool="false" hw-acceleration="use-GL" launch_mode="single">
-               <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow"/>
-               <label>Email</label>
-               <icon>/usr/share/icons/default/small/org.tizen.email.png</icon>
-               <label xml:lang="ar-ae">البريد الإلكتروني</label>
-               <label xml:lang="az-az">Elektron poçtlar</label>
-               <label xml:lang="bg-bg">Email</label>
-               <label xml:lang="ca-es">Correu electrònic</label>
-               <label xml:lang="cs-cz">E-mail</label>
-               <label xml:lang="da-dk">E-mail</label>
-               <label xml:lang="de-de">E-Mail</label>
-               <label xml:lang="el-gr">Email</label>
-               <label xml:lang="en-gb">Email</label>
-               <label xml:lang="en-ph">Email</label>
-               <label xml:lang="en-us">Email</label>
-               <label xml:lang="es-es">Correo electrónico</label>
-               <label xml:lang="es-us">Correo</label>
-               <label xml:lang="et-ee">E-post</label>
-               <label xml:lang="eu-es">Helbide elektronikoa</label>
-               <label xml:lang="fi-fi">Sähköposti</label>
-               <label xml:lang="fr-fr">E-mail</label>
-               <label xml:lang="fr-ca">Courriel</label>
-               <label xml:lang="ga-ie">R-phost</label>
-               <label xml:lang="gl-es">Correo electrónico</label>
-               <label xml:lang="hi-in">ईमेल</label>
-               <label xml:lang="hr-hr">Email</label>
-               <label xml:lang="hu-hu">E-mail</label>
-               <label xml:lang="hy-am">Էլ.փոստ</label>
-               <label xml:lang="is-is">Tölvupóstur</label>
-               <label xml:lang="it-it">E-mail</label>
-               <label xml:lang="ja-jp">Eメール</label>
-               <label xml:lang="ka-ge">ელ-ფოსტა</label>
-               <label xml:lang="kk-kz">Эл. пошта</label>
-               <label xml:lang="ko-kr">이메일</label>
-               <label xml:lang="lt-lt">El. paštas</label>
-               <label xml:lang="lv-lv">E-pasts</label>
-               <label xml:lang="mk-mk">Е-пошта</label>
-               <label xml:lang="nb-no">E-post</label>
-               <label xml:lang="nl-nl">E-mail</label>
-               <label xml:lang="pl-pl">E-mail</label>
-               <label xml:lang="pt-br">E-mail</label>
-               <label xml:lang="pt-pt">E-mail</label>
-               <label xml:lang="ro-ro">Email</label>
-               <label xml:lang="ru-ru">E-mail</label>
-               <label xml:lang="sk-sk">E-mail</label>
-               <label xml:lang="sl-si">E-pošta</label>
-               <label xml:lang="sr-rs">E-pošta</label>
-               <label xml:lang="sv-se">E-post</label>
-               <label xml:lang="tr-tr">E-posta</label>
-               <label xml:lang="uk-ua">Email</label>
-               <label xml:lang="uz-uz">E-pochta</label>
-               <label xml:lang="zh-cn">电子邮件</label>
-               <label xml:lang="zh-hk">電子郵件</label>
-               <label xml:lang="zh-tw">電子郵件</label>
-       </ui-application>
-       <ui-application appid="org.tizen.email-composer" exec="/usr/apps/org.tizen.email/bin/email-composer" hw-acceleration="use-GL" nodisplay="true" multiple="true" type="capp" taskmanage="false" process-pool="false" launch_mode="caller">
-               <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow"/>
-               <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow/nodisplay"/>
-               <label>Email</label>
-               <icon>/usr/share/icons/default/small/org.tizen.email.png</icon>
-               <label xml:lang="ar-ae">البريد الإلكتروني</label>
-               <label xml:lang="az-az">Elektron poçtlar</label>
-               <label xml:lang="bg-bg">Email</label>
-               <label xml:lang="ca-es">Correu electrònic</label>
-               <label xml:lang="cs-cz">E-mail</label>
-               <label xml:lang="da-dk">E-mail</label>
-               <label xml:lang="de-de">E-Mail</label>
-               <label xml:lang="el-gr">Email</label>
-               <label xml:lang="en-gb">Email</label>
-               <label xml:lang="en-ph">Email</label>
-               <label xml:lang="en-us">Email</label>
-               <label xml:lang="es-es">Correo electrónico</label>
-               <label xml:lang="es-us">Correo</label>
-               <label xml:lang="et-ee">E-post</label>
-               <label xml:lang="eu-es">Helbide elektronikoa</label>
-               <label xml:lang="fi-fi">Sähköposti</label>
-               <label xml:lang="fr-fr">E-mail</label>
-               <label xml:lang="fr-ca">Courriel</label>
-               <label xml:lang="ga-ie">R-phost</label>
-               <label xml:lang="gl-es">Correo electrónico</label>
-               <label xml:lang="hi-in">ईमेल</label>
-               <label xml:lang="hr-hr">Email</label>
-               <label xml:lang="hu-hu">E-mail</label>
-               <label xml:lang="hy-am">Էլ.փոստ</label>
-               <label xml:lang="is-is">Tölvupóstur</label>
-               <label xml:lang="it-it">E-mail</label>
-               <label xml:lang="ja-jp">Eメール</label>
-               <label xml:lang="ka-ge">ელ-ფოსტა</label>
-               <label xml:lang="kk-kz">Эл. пошта</label>
-               <label xml:lang="ko-kr">이메일</label>
-               <label xml:lang="lt-lt">El. paštas</label>
-               <label xml:lang="lv-lv">E-pasts</label>
-               <label xml:lang="mk-mk">Е-пошта</label>
-               <label xml:lang="nb-no">E-post</label>
-               <label xml:lang="nl-nl">E-mail</label>
-               <label xml:lang="pl-pl">E-mail</label>
-               <label xml:lang="pt-br">E-mail</label>
-               <label xml:lang="pt-pt">E-mail</label>
-               <label xml:lang="ro-ro">Email</label>
-               <label xml:lang="ru-ru">E-mail</label>
-               <label xml:lang="sk-sk">E-mail</label>
-               <label xml:lang="sl-si">E-pošta</label>
-               <label xml:lang="sr-rs">E-pošta</label>
-               <label xml:lang="sv-se">E-post</label>
-               <label xml:lang="tr-tr">E-posta</label>
-               <label xml:lang="uk-ua">Email</label>
-               <label xml:lang="uz-uz">E-pochta</label>
-               <label xml:lang="zh-cn">电子邮件</label>
-               <label xml:lang="zh-hk">電子郵件</label>
-               <label xml:lang="zh-tw">電子郵件</label>
-
-               <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/compose"/>
-               </application-service>
-               <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/compose"/>
-                       <uri name="mailto"/>
-               </application-service>
-
-               <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/share_text"/>
-               </application-service>
-               <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/share_text"/>
-                       <uri name="mailto"/>
-               </application-service>
-
-               <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/share"/>
-                       <mime name="*/*"/>
-               </application-service>
-               <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/share"/>
-                       <mime name="*/*"/>
-                       <uri name="mailto"/>
-               </application-service>
-
-               <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/multi_share"/>
-                       <mime name="*/*"/>
-               </application-service>
-               <application-service>
-                       <operation name="http://tizen.org/appcontrol/operation/multi_share"/>
-                       <mime name="*/*"/>
-                       <uri name="mailto"/>
-               </application-service>
-
-       </ui-application>
-       <ui-application appid="org.tizen.email-setting" exec="/usr/apps/org.tizen.email/bin/email-setting" hw-acceleration="use-GL" nodisplay="true" multiple="true" type="capp" taskmanage="false" process-pool="false" launch_mode="caller">
-               <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow"/>
-               <metadata key="http://developer.samsung.com/tizen/metadata/multiwindow/nodisplay"/>
-               <label>Email</label>
-               <icon>/usr/share/icons/default/small/org.tizen.email.png</icon>
-               <application-service>
-                       <operation name="tizen-email://org.tizen.email/email_setting_notification"/>
-               </application-service>
-               <application-service>
-                       <operation name="tizen-email://org.tizen.email/email_setting_signature"/>
-               </application-service>
-       </ui-application>
-       <account>
-               <account-provider appid="org.tizen.email-setting" providerid="http://www.tizen.org/" multiple-accounts-support="true">
-                       <icon section="account">/usr/share/icons/default/small/org.tizen.email.png</icon>
-                       <icon section="account-small">/usr/share/icons/default/small/org.tizen.email.png</icon>
-                       <label xml:lang="nl-nl">Email</label>
-                       <label>Email</label>
-                       <label xml:lang="en-gb">Email</label>
-                       <capability>http://tizen.org/account/capability/email</capability>
-               </account-provider>
-       </account>
-       <privileges>
-               <privilege>http://tizen.org/privilege/mediastorage</privilege>
-               <privilege>http://tizen.org/privilege/externalstorage</privilege>
-               <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-               <privilege>http://tizen.org/privilege/camera</privilege>
-               <privilege>http://tizen.org/privilege/recorder</privilege>
-               <privilege>http://tizen.org/privilege/notification</privilege>
-               <privilege>http://tizen.org/privilege/haptic</privilege>
-               <privilege>http://tizen.org/privilege/email</privilege>
-               <privilege>http://tizen.org/privilege/account.read</privilege>
-               <privilege>http://tizen.org/privilege/account.write</privilege>
-               <privilege>http://tizen.org/privilege/network.get</privilege>
-               <privilege>http://tizen.org/privilege/contact.read</privilege>
-       </privileges>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.email" version="0.9.34">
+    <profile name="mobile"/>
+    <description>Email Application</description>
+    <ui-application appid="org.tizen.email" exec="/usr/apps/org.tizen.email/bin/email" hw-acceleration="on" launch_mode="single" multiple="false" nodisplay="false" taskmanage="true" type="capp">
+        <icon>org.tizen.email.png</icon>
+        <label>Email</label>
+        <label xml:lang="ar-ae">البريد الإلكتروني</label>
+        <label xml:lang="az-az">Elektron poçtlar</label>
+        <label xml:lang="bg-bg">Email</label>
+        <label xml:lang="ca-es">Correu electrònic</label>
+        <label xml:lang="cs-cz">E-mail</label>
+        <label xml:lang="da-dk">E-mail</label>
+        <label xml:lang="de-de">E-Mail</label>
+        <label xml:lang="el-gr">Email</label>
+        <label xml:lang="en-gb">Email</label>
+        <label xml:lang="en-ph">Email</label>
+        <label xml:lang="en-us">Email</label>
+        <label xml:lang="es-es">Correo electrónico</label>
+        <label xml:lang="es-us">Correo</label>
+        <label xml:lang="et-ee">E-post</label>
+        <label xml:lang="eu-es">Helbide elektronikoa</label>
+        <label xml:lang="fi-fi">Sähköposti</label>
+        <label xml:lang="fr-fr">E-mail</label>
+        <label xml:lang="fr-ca">Courriel</label>
+        <label xml:lang="ga-ie">R-phost</label>
+        <label xml:lang="gl-es">Correo electrónico</label>
+        <label xml:lang="hi-in">ईमेल</label>
+        <label xml:lang="hr-hr">Email</label>
+        <label xml:lang="hu-hu">E-mail</label>
+        <label xml:lang="hy-am">Էլ.փոստ</label>
+        <label xml:lang="is-is">Tölvupóstur</label>
+        <label xml:lang="it-it">E-mail</label>
+        <label xml:lang="ja-jp">Eメール</label>
+        <label xml:lang="ka-ge">ელ-ფოსტა</label>
+        <label xml:lang="kk-kz">Эл. пошта</label>
+        <label xml:lang="ko-kr">이메일</label>
+        <label xml:lang="lt-lt">El. paštas</label>
+        <label xml:lang="lv-lv">E-pasts</label>
+        <label xml:lang="mk-mk">Е-пошта</label>
+        <label xml:lang="nb-no">E-post</label>
+        <label xml:lang="nl-nl">E-mail</label>
+        <label xml:lang="pl-pl">E-mail</label>
+        <label xml:lang="pt-br">E-mail</label>
+        <label xml:lang="pt-pt">E-mail</label>
+        <label xml:lang="ro-ro">Email</label>
+        <label xml:lang="ru-ru">E-mail</label>
+        <label xml:lang="sk-sk">E-mail</label>
+        <label xml:lang="sl-si">E-pošta</label>
+        <label xml:lang="sr-rs">E-pošta</label>
+        <label xml:lang="sv-se">E-post</label>
+        <label xml:lang="tr-tr">E-posta</label>
+        <label xml:lang="uk-ua">Email</label>
+        <label xml:lang="uz-uz">E-pochta</label>
+        <label xml:lang="zh-cn">电子邮件</label>
+        <label xml:lang="zh-hk">電子郵件</label>
+        <label xml:lang="zh-tw">電子郵件</label>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/compose"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/compose"/>
+            <uri name="mailto"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/share_text"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/share_text"/>
+            <uri name="mailto"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/share"/>
+            <mime name="*/*"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/share"/>
+            <uri name="mailto"/>
+            <mime name="*/*"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/multi_share"/>
+            <mime name="application/xhtml+xml"/>
+        </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/multi_share"/>
+            <uri name="mailto"/>
+            <mime name="*/*"/>
+        </app-control>
+    </ui-application>
+    <account>
+        <account-provider appid="org.tizen.email" multiple-accounts-support="true" providerid="http://www.tizen.org/">
+            <icon section="account">org.tizen.email.png</icon>
+            <icon section="account-small">org.tizen.email.png</icon>
+            <label>Email</label>
+            <label xml:lang="ar-ae">البريد الإلكتروني</label>
+            <label xml:lang="az-az">Elektron poçtlar</label>
+            <label xml:lang="bg-bg">Email</label>
+            <label xml:lang="ca-es">Correu electrònic</label>
+            <label xml:lang="cs-cz">E-mail</label>
+            <label xml:lang="da-dk">E-mail</label>
+            <label xml:lang="de-de">E-Mail</label>
+            <label xml:lang="el-gr">Email</label>
+            <label xml:lang="en-gb">Email</label>
+            <label xml:lang="en-ph">Email</label>
+            <label xml:lang="en-us">Email</label>
+            <label xml:lang="es-es">Correo electrónico</label>
+            <label xml:lang="es-us">Correo</label>
+            <label xml:lang="et-ee">E-post</label>
+            <label xml:lang="eu-es">Helbide elektronikoa</label>
+            <label xml:lang="fi-fi">Sähköposti</label>
+            <label xml:lang="fr-fr">E-mail</label>
+            <label xml:lang="fr-ca">Courriel</label>
+            <label xml:lang="ga-ie">R-phost</label>
+            <label xml:lang="gl-es">Correo electrónico</label>
+            <label xml:lang="hi-in">ईमेल</label>
+            <label xml:lang="hr-hr">Email</label>
+            <label xml:lang="hu-hu">E-mail</label>
+            <label xml:lang="hy-am">Էլ.փոստ</label>
+            <label xml:lang="is-is">Tölvupóstur</label>
+            <label xml:lang="it-it">E-mail</label>
+            <label xml:lang="ja-jp">Eメール</label>
+            <label xml:lang="ka-ge">ელ-ფოსტა</label>
+            <label xml:lang="kk-kz">Эл. пошта</label>
+            <label xml:lang="ko-kr">이메일</label>
+            <label xml:lang="lt-lt">El. paštas</label>
+            <label xml:lang="lv-lv">E-pasts</label>
+            <label xml:lang="mk-mk">Е-пошта</label>
+            <label xml:lang="nb-no">E-post</label>
+            <label xml:lang="nl-nl">E-mail</label>
+            <label xml:lang="pl-pl">E-mail</label>
+            <label xml:lang="pt-br">E-mail</label>
+            <label xml:lang="pt-pt">E-mail</label>
+            <label xml:lang="ro-ro">Email</label>
+            <label xml:lang="ru-ru">E-mail</label>
+            <label xml:lang="sk-sk">E-mail</label>
+            <label xml:lang="sl-si">E-pošta</label>
+            <label xml:lang="sr-rs">E-pošta</label>
+            <label xml:lang="sv-se">E-post</label>
+            <label xml:lang="tr-tr">E-posta</label>
+            <label xml:lang="uk-ua">Email</label>
+            <label xml:lang="uz-uz">E-pochta</label>
+            <label xml:lang="zh-cn">电子邮件</label>
+            <label xml:lang="zh-hk">電子郵件</label>
+            <label xml:lang="zh-tw">電子郵件</label>
+            <capability>http://tizen.org/account/capability/email</capability>
+        </account-provider>
+    </account>
+    <privileges>
+        <privilege>http://tizen.org/privilege/recorder</privilege>
+        <privilege>http://tizen.org/privilege/account.write</privilege>
+        <privilege>http://tizen.org/privilege/network.get</privilege>
+        <privilege>http://tizen.org/privilege/mediastorage</privilege>
+        <privilege>http://tizen.org/privilege/camera</privilege>
+        <privilege>http://tizen.org/privilege/notification</privilege>
+        <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+        <privilege>http://tizen.org/privilege/haptic</privilege>
+        <privilege>http://tizen.org/privilege/account.read</privilege>
+        <privilege>http://tizen.org/privilege/email</privilege>
+        <privilege>http://tizen.org/privilege/externalstorage</privilege>
+        <privilege>http://tizen.org/privilege/contact.read</privilege>
+    </privileges>
 </manifest>

diff --git a/packaging/org.tizen.email.spec b/packaging/org.tizen.email.spec
index c9da4d7..b2c6b81 100644 (file)
--- a/packaging/org.tizen.email.spec
+++ b/packaging/org.tizen.email.spec
@@ -18,6 +18,8 @@ ExcludeArch: %{arm} %ix86 x86_64
 
 %define _enable_attach_panel 1
 
+%define _build_shared_libs 1
+
 Requires: email-service
 BuildRequires: cmake
 BuildRequires: edje-tools
@@ -113,6 +115,7 @@ cd %{_tmp_buld_dir}
 
 cmake ../../CMake -DCMAKE_INSTALL_PREFIX=%{_pkg_dir} \
        -DENABLE_ATTACH_PANEL=%{_enable_attach_panel} \
+       -DBUILD_SHARED_LIBS=%{_build_shared_libs} \
        -DSYS_ICONS_DIR=%{_sys_icons_dir} \
        -DSYS_PACKAGES_DIR=%{_sys_packages_dir} \
 %if 0%{?_tizen_2_4}
@@ -166,7 +169,9 @@ pkgdir_maker --create --pkgid=%{name}
 %{_sys_smack_dir}/%{name}.efl
 %endif
 
+%if 0%{?_build_shared_libs}
 %{_pkg_lib_dir}/*.so
+%endif
 
 %{_pkg_dir}/res/edje/email-common-theme.edj
 %{_pkg_dir}/res/edje/email-setting-theme.edj
@@ -180,8 +185,11 @@ pkgdir_maker --create --pkgid=%{name}
 %{_pkg_dir}/res/misc/*
 
 %{_pkg_dir}/bin/email
+
+%if 0%{?_build_shared_libs}
 %{_pkg_dir}/bin/email-setting
 %{_pkg_dir}/bin/email-composer
+%endif
 
 %{_sys_icons_dir}/%{name}.png
 %{_sys_packages_dir}/%{name}.xml