Change directory according to 3.0 directory policy

Change-Id: I9079b5f7d2d362ebada6fd5ff7766047f6d6b677

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8941b93..f81618c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,11 +22,9 @@ SET(ISE_SRCS
 SET(ISE_PACKAGE ${PROJECT_NAME})
 SET(ISE_PKGNAME ${PACKAGE})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(LIBDIR ${LIB_INSTALL_DIR})
-SET(ISE_LIBDIR "${LIBDIR}/scim-1.0/1.4.0/Helper")
-SET(ISE_RESDIR "${PREFIX}/share/isf/ise/ise-default/720x1280/default")
-SET(MANIFEST_DIR "${PREFIX}/share/packages")
-
+SET(ISE_LIBDIR "${TZ_SYS_RO_APP}/${ISE_PACKAGE}/lib")
+SET(ISE_RESDIR "${TZ_SYS_RO_APP}/${ISE_PACKAGE}/res")
+SET(ISE_LAYOUTDIR "${ISE_RESDIR}/720x1280/default")
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
     SET(CMAKE_BUILD_TYPE "Release")
 ENDIF()
@@ -62,6 +60,8 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -g")
 
 ADD_DEFINITIONS("-DPACKAGE=\"${ISE_PACKAGE}\"")
 ADD_DEFINITIONS("-DPACKAGE_NAME=\"${ISE_PKGNAME}\"")
+ADD_DEFINITIONS("-DRESDIR=\"${ISE_RESDIR}\"")
+ADD_DEFINITIONS("-DLAYOUTDIR=\"${ISE_LAYOUTDIR}\"")
 ADD_DEFINITIONS(-DISE_NAME=\"/ise-default\")
 ADD_DEFINITIONS(-DSUPPORTS_EMOTICONS)
 
@@ -78,7 +78,7 @@ ADD_CUSTOM_TARGET(
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/edc/candidate-single/candidate.edc
 )
 ADD_DEPENDENCIES(${PROJECT_NAME} candidate-single.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/candidate-single.edj DESTINATION ${ISE_RESDIR}/sdk/edc)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/candidate-single.edj DESTINATION ${ISE_LAYOUTDIR}/sdk/edc)
 # For edc File end
 # For edc File
 ADD_CUSTOM_TARGET(
@@ -91,7 +91,7 @@ ADD_CUSTOM_TARGET(
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/edc/candidate-multiline/candidate.edc
 )
 ADD_DEPENDENCIES(${PROJECT_NAME} candidate-multiline.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/candidate-multiline.edj DESTINATION ${ISE_RESDIR}/sdk/edc)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/candidate-multiline.edj DESTINATION ${ISE_LAYOUTDIR}/sdk/edc)
 # For edc File end
 # For edc File
 ADD_CUSTOM_TARGET(
@@ -103,7 +103,7 @@ ADD_CUSTOM_TARGET(
         ${CMAKE_BINARY_DIR}/customised_gengrid.edj
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/edc/gengrid/customised_gengrid.edc)
 ADD_DEPENDENCIES(${PROJECT_NAME} customised_gengrid.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/customised_gengrid.edj DESTINATION ${ISE_RESDIR}/sdk/edc)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/customised_gengrid.edj DESTINATION ${ISE_LAYOUTDIR}/sdk/edc)
 
 ADD_CUSTOM_TARGET(
     layout_keypad.edj
@@ -112,7 +112,7 @@ ADD_CUSTOM_TARGET(
         ${CMAKE_BINARY_DIR}/layout_keypad.edj
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/data/edc/gengrid/layout_keypad.edc)
 ADD_DEPENDENCIES(${PROJECT_NAME} layout_keypad.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/layout_keypad.edj DESTINATION ${ISE_RESDIR}/sdk/edc)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/layout_keypad.edj DESTINATION ${ISE_LAYOUTDIR}/sdk/edc)
 # For edc File end
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ISE_PKGS_LDFLAGS})
@@ -121,23 +121,23 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${ISE_LIBDIR})
 
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.xml DESTINATION
-        ${MANIFEST_DIR})
+        ${TZ_SYS_RO_PACKAGES})
 
 if(${TARGET} STREQUAL "tv")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/pixmaps/default/tv/
-        DESTINATION ${ISE_RESDIR}/tv/image)
+        DESTINATION ${ISE_LAYOUTDIR}/tv/image)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/layout/tv/ DESTINATION
-        ${ISE_RESDIR}/tv FILES_MATCHING PATTERN "*.xml")
+        ${ISE_LAYOUTDIR}/tv FILES_MATCHING PATTERN "*.xml")
 elseif(${TARGET} STREQUAL "wearable")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/pixmaps/default/wearable/
-        DESTINATION ${ISE_RESDIR}/wearable/image)
+        DESTINATION ${ISE_LAYOUTDIR}/wearable/image)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/layout/wearable/ DESTINATION
-        ${ISE_RESDIR}/wearable FILES_MATCHING PATTERN "*.xml")
+        ${ISE_LAYOUTDIR}/wearable FILES_MATCHING PATTERN "*.xml")
 elseif(${TARGET} STREQUAL "mobile")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/pixmaps/default/sdk/
-        DESTINATION ${ISE_RESDIR}/sdk/image)
+        DESTINATION ${ISE_LAYOUTDIR}/sdk/image)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/layout/sdk/ DESTINATION
-        ${ISE_RESDIR}/sdk FILES_MATCHING PATTERN "*.xml")
+        ${ISE_LAYOUTDIR}/sdk FILES_MATCHING PATTERN "*.xml")
 endif()
 
 ADD_SUBDIRECTORY(po)

diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec
index 496b097..204e819 100644 (file)
--- a/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@ -19,7 +19,7 @@ BuildRequires:  pkgconfig(libscl-core)
 BuildRequires:  pkgconfig(ecore-imf)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(efl-extension)
-
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 
 %description
@@ -53,14 +53,15 @@ CXXFLAGS+=" -D_TV";
 
 rm -rf CMakeFiles
 rm -rf CMakeCache.txt
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}  -DLIB_INSTALL_DIR:PATH=%{_libdir} -DTARGET=%{?profile}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+        -DTARGET=%{?profile} \
+        -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP \
+        -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES
 
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
 
 %make_install
 
@@ -71,9 +72,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_libdir}/scim-1.0/1.4.0/Helper/ise-default.so
-%{_datadir}/isf/ise/ise-default/*
-%{_datadir}/packages/*
-%{_datadir}/locale/*
-/usr/share/license/%{name}
+%{TZ_SYS_RO_APP}/*
+%{TZ_SYS_RO_PACKAGES}/%{name}.xml
+%license LICENSE
 

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 85e3c22..42e8fc9 100644 (file)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,6 +1,6 @@
 # for i18n
 
-SET(LOCALEDIR "${PREFIX}/share/locale")
+SET(LOCALEDIR "${ISE_RESDIR}/locale")
 SET(POFILES
                ar.po as.po az.po be_BY.po bg.po bn.po bn_BD.po ca.po cs.po da.po de.po el_GR.po en.po en_PH.po
                en_US.po es_ES.po es_US.po et.po eu.po fa.po fi.po fr.po fr_CA.po ga.po gl.po gu.po he.po

diff --git a/src/include/ise.h b/src/include/ise.h
index 2e73b57..e58865c 100644 (file)
--- a/src/include/ise.h
+++ b/src/include/ise.h
@@ -26,20 +26,20 @@
 #include "languages.h"
 
 #define ISE_VERSION "1.1.0-1"
-#define LOCALEDIR "/usr/share/locale"
+#define LOCALEDIR RESDIR"/locale"
 
 #define PRIMARY_LATIN_LANGUAGE "English"
 #undef MAIN_ENTRY_XML_PATH
 #ifdef _TV
-#define MAIN_ENTRY_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/tv/main_entry.xml"
+#define MAIN_ENTRY_XML_PATH LAYOUTDIR"/tv/main_entry.xml"
 #elif _WEARABLE
-#define MAIN_ENTRY_XML_PATH_720X1280   "/usr/share/isf/ise/ise-default/720x1280/default/wearable/main_entry.xml"
+#define MAIN_ENTRY_XML_PATH_720X1280   LAYOUTDIR"/wearable/main_entry.xml"
 #define MAIN_ENTRY_XML_PATH MAIN_ENTRY_XML_PATH_720X1280
 #else
-#define MAIN_ENTRY_XML_PATH_480X800    "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry_480x800.xml"
-#define MAIN_ENTRY_XML_PATH_540X960    "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry_540x960.xml"
-#define MAIN_ENTRY_XML_PATH_720X1280   "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry.xml"
-#define MAIN_ENTRY_XML_PATH_1440X2560  "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry_1440x2560.xml"
+#define MAIN_ENTRY_XML_PATH_480X800    LAYOUTDIR"/sdk/main_entry_480x800.xml"
+#define MAIN_ENTRY_XML_PATH_540X960    LAYOUTDIR"/sdk/main_entry_540x960.xml"
+#define MAIN_ENTRY_XML_PATH_720X1280   LAYOUTDIR"/sdk/main_entry.xml"
+#define MAIN_ENTRY_XML_PATH_1440X2560  LAYOUTDIR"/sdk/main_entry_1440x2560.xml"
 #define MAIN_ENTRY_XML_PATH MAIN_ENTRY_XML_PATH_720X1280
 #endif
 

diff --git a/src/ise-emoticon-mode.cpp b/src/ise-emoticon-mode.cpp
index ea16138..e2153e4 100644 (file)
--- a/src/ise-emoticon-mode.cpp
+++ b/src/ise-emoticon-mode.cpp
@@ -43,9 +43,9 @@
 #define ISE_HEIGHT_LAND         318
 #endif
 
-#define EMOTICON_DIR "/usr/share/emoticons/"
-#define EMOTICON_EDJ_FILE_PATH "/usr/share/isf/ise/ise-default/720x1280/default/sdk/edc/layout_keypad.edj"
-#define CUSTOM_GENGRID_EDJ_FILE_PATH "/usr/share/isf/ise/ise-default/720x1280/default/sdk/edc/customised_gengrid.edj"
+#define EMOTICON_DIR LAYOUTDIR"/emoticons/"
+#define EMOTICON_EDJ_FILE_PATH LAYOUTDIR"/sdk/edc/layout_keypad.edj"
+#define CUSTOM_GENGRID_EDJ_FILE_PATH LAYOUTDIR"/sdk/edc/customised_gengrid.edj"
 
 #define EMOTICON_EDJ_GROUP_PORT_CANDIDATE_ON "emoticon.main.portrait.candidate.on"
 #define EMOTICON_EDJ_GROUP_LAND_CANDIDATE_ON "emoticon.main.landscape.candidate.on"

diff --git a/src/sdk/ise_lang_table.cpp b/src/sdk/ise_lang_table.cpp
index 8aebebd..f875509 100644 (file)
--- a/src/sdk/ise_lang_table.cpp
+++ b/src/sdk/ise_lang_table.cpp
@@ -31,11 +31,11 @@
 using namespace scl;
 
 #ifdef _TV
-#define LANG_TABLE_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/tv/ise_lang_table.xml"
+#define LANG_TABLE_XML_PATH LAYOUTDIR"/tv/ise_lang_table.xml"
 #elif _WEARABLE
-#define LANG_TABLE_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/wearable/ise_lang_table.xml"
+#define LANG_TABLE_XML_PATH LAYOUTDIR"/wearable/ise_lang_table.xml"
 #else
-#define LANG_TABLE_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/sdk/ise_lang_table.xml"
+#define LANG_TABLE_XML_PATH LAYOUTDIR"/sdk/ise_lang_table.xml"
 #endif
 
 typedef struct Keyboard_UUID {

diff --git a/src/sdk/sdk.h b/src/sdk/sdk.h
index 0229ec9..b680717 100755 (executable)
--- a/src/sdk/sdk.h
+++ b/src/sdk/sdk.h
@@ -30,11 +30,11 @@
 #define LANGUAGE_STRING "_LANGUAGE_"
 #undef MAIN_ENTRY_XML_PATH
 #ifdef _TV
-#define MAIN_ENTRY_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/tv/main_entry.xml"
+#define MAIN_ENTRY_XML_PATH LAYOUTDIR"/tv/main_entry.xml"
 #elif _WEARABLE
-#define MAIN_ENTRY_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/wearable/main_entry.xml"
+#define MAIN_ENTRY_XML_PATH LAYOUTDIR"/wearable/main_entry.xml"
 #else
-#define MAIN_ENTRY_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry.xml"
+#define MAIN_ENTRY_XML_PATH LAYOUTDIR"/sdk/main_entry.xml"
 #endif
 
 #endif