X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=bc9962cc062e6b642dbb9bfa46dea2088bedd9b3;hb=e7e95ca773350b41221440a48bfce39b2e968f40;hp=0199a0c0967a63f91f7166c8c22f81efca72f800;hpb=034934923e3bdb9e399eed4caf58f205f9770678;p=framework%2Fweb%2Fwrt-installer.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0199a0c..bc9962c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,7 +45,6 @@ SET(INSTALLER_INCLUDES
     ${INSTALLER_SRC_DIR}/configuration_parser
     ${INSTALLER_SRC_DIR}/wrt-installer
     ${INSTALLER_SRC_DIR}/commons
-    ${INSTALLER_SRC_DIR}/commons/drm    #this is temporary code for drm
     ${INSTALLER_SRC_DIR}/pkg-manager
 )
 
@@ -66,26 +65,27 @@ SET(INSTALLER_SOURCES
     ${INSTALLER_JOBS}/widget_install/task_unzip.cpp
     ${INSTALLER_JOBS}/widget_install/task_widget_config.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_remove_backup.cpp
     ${INSTALLER_JOBS}/widget_install/task_encrypt_resource.cpp
-    ${INSTALLER_JOBS}/widget_install/task_plugins_copy.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_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
@@ -96,46 +96,66 @@ SET(INSTALLER_SOURCES
     ${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
-    cert-svc-vcore
-    security-core
     dpl-event-efl
     dpl-utils-efl
     dpl-wrt-dao-ro
     dpl-wrt-dao-rw
-    dpl-encryption
+    wrt-commons-custom-handler-dao-rw
+    wrt-commons-security-origin-dao
+    wrt-plugins-types
+    pkgmgr-installer
+    pkgmgr-parser
+    web-provider
+    osp-appfw
+    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
-    drm-client
+    app2sd
+    vconf
     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
@@ -144,24 +164,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"
     )
 
-
-# Below Code is temporary. When DRM engine is provided it will be removed.
-MESSAGE("ARCH ${ARCH}")
-IF("${ARCH}" MATCHES "arm")
-	TARGET_LINK_LIBRARIES(${TARGET_INSTALLER_STATIC}
-            "-L${PROJECT_SOURCE_DIR}/etc/drm/armv7l -ldrm-service-core-intel" -Wl,--allow-shlib-undefine)
-ELSE("${ARCH}" MATCHES "arm")
-	TARGET_LINK_LIBRARIES(${TARGET_INSTALLER_STATIC}
-            "-L${PROJECT_SOURCE_DIR}/etc/drm/ix86 -ldrm-service-core-intel" -Wl,--allow-shlib-undefine)
-ENDIF("${ARCH}" MATCHES "arm")
-
-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)