From 7fc78ce3e7ce4d4e362c93346bfbff10715f1fbf Mon Sep 17 00:00:00 2001 From: Duyoung Jang Date: Wed, 24 Apr 2013 20:52:02 +0900 Subject: [PATCH] Fix installation path for multi-language Change-Id: Ib55d9cf74e753088f8020619f1fa207b8cf5dd68 Signed-off-by: Duyoung Jang --- .cproject | 1 + CMakeLists.txt | 3 ++- inc/InstallerDefs.h | 2 +- packaging/osp-installer.spec | 4 +++- src/backend/backend.cpp | 3 +++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cproject b/.cproject index 0a69562..9e7631d 100755 --- a/.cproject +++ b/.cproject @@ -49,6 +49,7 @@ + diff --git a/CMakeLists.txt b/CMakeLists.txt index 502c3db..b8b0e4e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ INCLUDE_DIRECTORIES( /usr/include/system /usr/include/cert-svc /usr/include/dpl-efl + /usr/include/appcore ) SET (${this_target}_SOURCE_FILES @@ -80,7 +81,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fvisibility=hidden") SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${OSP_COMPILER_FLAGS}") TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw -lxml2 -lpkgmgr_installer -lpkgmgr_parser -lglib-2.0 -lapp2ext -ldl" -Wl,--allow-shlib-undefined) -TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib -lcert-svc-vcore -ldpl-efl -lcert-svc -lcapi-system-info") +TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib -lcert-svc-vcore -ldpl-efl -lcert-svc -lcapi-system-info -lappcore-common") ADD_SUBDIRECTORY(plugin) diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h index 513d278..a322713 100755 --- a/inc/InstallerDefs.h +++ b/inc/InstallerDefs.h @@ -23,7 +23,7 @@ #include "InstallerUtil.h" -#define OSP_INSTALLER_VERSION "version=[20130424.1]" +#define OSP_INSTALLER_VERSION "version=[20130424.2]" #define DIR_BIN L"/bin" #define DIR_INFO L"/info" diff --git a/packaging/osp-installer.spec b/packaging/osp-installer.spec index b797c0c..95d1c39 100755 --- a/packaging/osp-installer.spec +++ b/packaging/osp-installer.spec @@ -19,13 +19,15 @@ BuildRequires: pkgconfig(osp-appfw) BuildRequires: pkgconfig(dpl-efl) BuildRequires: pkgconfig(cert-svc) BuildRequires: pkgconfig(cert-svc-vcore) +BuildRequires: pkgconfig(appcore-common) BuildRequires: osp-appfw-internal-devel # runtime requires Requires: osp-appfw -Requires: osp-loader +Requires: osp-loader +Requires: appcore-common %description osp application installer diff --git a/src/backend/backend.cpp b/src/backend/backend.cpp index bb0633f..c04ec68 100755 --- a/src/backend/backend.cpp +++ b/src/backend/backend.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -57,6 +58,8 @@ main(int argc, char **argv) pkgmgr_installer *pi = null; int req_type = 0; + appcore_set_i18n(null, null); + Osp_Initialize(); String buf; -- 2.7.4