X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=8832baf48ba61b4c5acd90fa2b359dc0be8b25b2;hb=077e68e7d8c91c5d18f2f73ece5c3c343645a434;hp=b25090b0880f6b4ebab047a7c984c9f420f089ef;hpb=8ec41fa51d9e04f17c66ef90bbaa9711de29e342;p=framework%2Fweb%2Fwrt-installer.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
old mode 100755
new mode 100644
index b25090b..8832baf
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,6 +20,8 @@
 
 SET(TARGET_INSTALLER "wrt-installer")
 
+OPTION(LB_SUPPORT "lb support" OFF)
+
 SET(INSTALLER_SRC_DIR
     ${PROJECT_SOURCE_DIR}/src
     )
@@ -52,7 +54,6 @@ SET(INSTALLER_SOURCES
     ${INSTALLER_CONFIG_PARSER}/ignoring_parser.cpp
     ${INSTALLER_CONFIG_PARSER}/deny_all_parser.cpp
     ${INSTALLER_CONFIG_PARSER}/libiriwrapper.cpp
-    ${INSTALLER_CONFIG_PARSER}/WidgetConfigurationManager.cpp
     ${INSTALLER_JOBS}/job.cpp
     ${INSTALLER_JOBS}/plugin_install/job_plugin_install.cpp
     ${INSTALLER_JOBS}/plugin_install/plugin_install_task.cpp
@@ -63,71 +64,101 @@ SET(INSTALLER_SOURCES
     ${INSTALLER_JOBS}/widget_install/task_commons.cpp
     ${INSTALLER_JOBS}/widget_install/task_unzip.cpp
     ${INSTALLER_JOBS}/widget_install/task_widget_config.cpp
-    ${INSTALLER_JOBS}/widget_install/task_db_update.cpp
+    ${INSTALLER_JOBS}/widget_install/task_database.cpp
+    ${INSTALLER_JOBS}/widget_install/ace_registration.cpp
+    ${INSTALLER_JOBS}/widget_install/task_file_manipulation.cpp
     ${INSTALLER_JOBS}/widget_install/task_smack.cpp
     ${INSTALLER_JOBS}/widget_install/task_ace_check.cpp
     ${INSTALLER_JOBS}/widget_install/task_manifest_file.cpp
     ${INSTALLER_JOBS}/widget_install/task_certify.cpp
-    ${INSTALLER_JOBS}/widget_install/task_private_storage.cpp
     ${INSTALLER_JOBS}/widget_install/task_prepare_files.cpp
     ${INSTALLER_JOBS}/widget_install/task_recovery.cpp
     ${INSTALLER_JOBS}/widget_install/task_install_ospsvc.cpp
     ${INSTALLER_JOBS}/widget_install/task_update_files.cpp
-    ${INSTALLER_JOBS}/widget_install/task_new_db_insert.cpp
     ${INSTALLER_JOBS}/widget_install/task_remove_backup.cpp
     ${INSTALLER_JOBS}/widget_install/task_encrypt_resource.cpp
+    ${INSTALLER_JOBS}/widget_install/task_certificates.cpp
+    ${INSTALLER_JOBS}/widget_install/task_prepare_reinstall.cpp
     ${INSTALLER_JOBS}/widget_install/wac_security.cpp
     ${INSTALLER_JOBS}/widget_install/widget_update_info.cpp
-    ${INSTALLER_JOBS}/widget_install/widget_install_popup.cpp
+    ${INSTALLER_JOBS}/widget_install/directory_api.cpp
     ${INSTALLER_JOBS}/widget_uninstall/job_widget_uninstall.cpp
     ${INSTALLER_JOBS}/widget_uninstall/task_check.cpp
     ${INSTALLER_JOBS}/widget_uninstall/task_remove_files.cpp
+    ${INSTALLER_JOBS}/widget_uninstall/task_remove_custom_handlers.cpp
     ${INSTALLER_JOBS}/widget_uninstall/task_db_update.cpp
     ${INSTALLER_JOBS}/widget_uninstall/task_smack.cpp
     ${INSTALLER_JOBS}/widget_uninstall/task_uninstall_ospsvc.cpp
+    ${INSTALLER_JOBS}/widget_uninstall/task_delete_certificates.cpp
     ${INSTALLER_SRC_DIR}/logic/installer_logic.cpp
     ${INSTALLER_SRC_DIR}/logic/installer_controller.cpp
     ${INSTALLER_SRC_DIR}/misc/wac_widget_id.cpp
     ${INSTALLER_SRC_DIR}/misc/feature_logic.cpp
     ${INSTALLER_SRC_DIR}/misc/libxml_utils.cpp
+    ${INSTALLER_SRC_DIR}/misc/widget_location.cpp
+    ${INSTALLER_SRC_DIR}/misc/widget_install_to_external.cpp
     ${INSTALLER_SRC_DIR}/pkg-manager/pkgmgr_signal.cpp
     )
 
+IF(LB_SUPPORT)
+    SET(INSTALLER_SOURCES
+        ${INSTALLER_SOURCES}
+        )
+    MESSAGE(STATUS "adding definition -DLB_SUPPORT")
+    ADD_DEFINITIONS("-DLB_SUPPORT")
+ENDIF(LB_SUPPORT)
+
 MESSAGE(STATUS "add -DSEP_INSTALLER")
 ADD_DEFINITIONS("-DSEP_INSTALLER")
 
 
 PKG_CHECK_MODULES(INSTALLER_STATIC_DEP
-    libxml-2.0
-    openssl
     dpl-efl
-    vcore
-    wrt-security
     dpl-event-efl
     dpl-utils-efl
     dpl-wrt-dao-ro
     dpl-wrt-dao-rw
-    dpl-encryption
-    ace-install
+    wrt-commons-custom-handler-dao-rw
+    wrt-commons-security-origin-dao
+    wrt-plugins-types
+    pkgmgr-installer
+    pkgmgr-parser
+    pkgmgr-info
+    web-provider
+    osp-appfw
+    libsmack
+    REQUIRED
+)
+
+PKG_CHECK_MODULES(SYS_INSTALLER_STATIC_DEP
+    appsvc
+    libxml-2.0
+    openssl
+    cert-svc-vcore
+    security-install
     ecore-x
     xmlsec1
     libidn
     libiri
     libpcrecpp
-    wrt-plugins-types
     ail
     elementary
-    pkgmgr-installer
-    pkgmgr-parser
     tapi
     shortcut
+    capi-appfw-app-manager
+    app2sd
+    vconf
+    libprivilege-control
     REQUIRED
-    )
+)
+
+INCLUDE_DIRECTORIES( SYSTEM ${SYS_INSTALLER_STATIC_DEP_INCLUDE_DIRS})
 
 INCLUDE_DIRECTORIES(
     ${INSTALLER_DEP_INCLUDES}
     ${INSTALLER_INCLUDES}
     ${INSTALLER_STATIC_DEP_INCLUDE_DIRS}
+    ${OSP_APPFW_INCLUDES}
     )
 
 ADD_LIBRARY(${TARGET_INSTALLER_STATIC} STATIC
@@ -136,13 +167,16 @@ ADD_LIBRARY(${TARGET_INSTALLER_STATIC} STATIC
 
 ADD_DEFINITIONS(${INSTALLER_STATIC_DEP_CFLAGS})
 ADD_DEFINITIONS(${INSTALLER_STATIC_DEP_CFLAGS_OTHERS})
+ADD_DEFINITIONS(${SYS_INSTALLER_STATIC_DEP_CFLAGS})
+ADD_DEFINITIONS(${SYS_INSTALLER_STATIC_DEP_CFLAGS_OTHERS})
 
 TARGET_LINK_LIBRARIES(${TARGET_INSTALLER_STATIC}
-    ${INSTALLER_STATIC_DEP_LIBRARIES}
+    ${INSTALLER_STATIC_DEP_LIBRARIES} "-ldl"
+    ${SYS_INSTALLER_STATIC_DEP_LIBRARIES} "-ldl"
     )
 
-SET_TARGET_PROPERTIES(${TARGET_INSTALLER_STATIC} PROPERTIES
-        COMPILE_FLAGS -fPIC)
+#for encryption
+TARGET_LINK_LIBRARIES(${TARGET_INSTALLER_STATIC} -L/usr/lib/osp -losp-appfw )
 
 ADD_SUBDIRECTORY(pkg-manager)
 ADD_SUBDIRECTORY(wrt-installer)