Modify path of sampleapp and Remove unused resource

Change-Id: Iea45caf7311b59612149475f86540158f9c46a19
Signed-off-by: yeji01kim <yeji01.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfacf1e..d7d8aa0 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,17 +59,8 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NA
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${test_pkgs_LIBRARIES})
 
-#Create edj file
-ADD_CUSTOM_TARGET(org.tizen.dpm-toolkit.edj
-       COMMAND edje_cc -no-save ${CMAKE_CURRENT_SOURCE_DIR}/res/org.tizen.dpm-toolkit.edc
-       ${CMAKE_BINARY_DIR}/org.tizen.dpm-toolkit.edj
-       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/org.tizen.dpm-toolkit.edc)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} org.tizen.dpm-toolkit.edj)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/org.tizen.dpm-toolkit.edj DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/res)
-
 #Install app data
 INSTALL(FILES res/${PROJECT_NAME}.png DESTINATION ${CMAKE_DESKTOP_ICON_DIR})
 INSTALL(FILES ${PROJECT_NAME}.xml DESTINATION ${CMAKE_APP_SHARE_PACKAGES_DIR})
 INSTALL(FILES data/dpm-toolkit.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME})
-INSTALL(FILES data/sampleapp.tpk DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME})
+INSTALL(FILES data/sampleapp.tpk DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/res)

diff --git a/edc_resource/genlist_custom.edc b/edc_resource/genlist_custom.edc
deleted file mode 100644 (file)
index 524df0f..0000000
--- a/edc_resource/genlist_custom.edc
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
- 
-group { name: "gl_custom_item";
-       styles{
-               style { name: "text_style";
-                       base: "color=#000000FF font=Tizen:style=Regular font_size=30 text_class=list_item ellipsis=1.0";
-                       tag:  "br" "\n";
-                       tag:  "ps" "ps";
-                       tag:  "tab" "\t";
-                       tag:  "b" "+ font_weight=Bold";
-                       tag:  "match" "+ color=#0051B5FF";
-               }
-       }
-       parts {
-               part { name: "base";
-                       type: SPACER;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               min: 0 120; //GENLIST_ITEM_1LINE_HEIGHT
-                       }
-               }
-               part { name: "left_padding";
-                       type: SPACER;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               min: 24 0;
-                               align: 0.0 0.0;
-                               rel1 { to: "base"; relative: 0.0 0.0; }
-                               rel2 { to: "base"; relative: 0.0 1.0; }
-                       }
-               }
-               part { name: "right_padding";
-                       type: SPACER;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               min: 24 0;
-                               align: 1.0 0.0;
-                               rel1 { to: "base"; relative: 1.0 0.0; }
-                               rel2 { to: "base"; relative: 1.0 1.0; }
-                       }
-               }
-               part { name: "top_padding";
-                       type: SPACER;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               min: 0 17;
-                               align: 0.0 0.0;
-                               rel1 { to_x: "left_padding"; to_y: "base"; relative: 1.0 0.0; }
-                               rel2 { to_x: "right_padding"; to_y: "base"; relative: 0.0 0.0; }
-                       }
-               }
-               part { name: "elm.text";
-                       type: SWALLOW;
-                       scale: 1;
-                       mouse_events: 0;
-                       description { state: "default" 0.0;
-                               min: 0 41;
-                               align: 0.0 0.0;
-                               rel1 { to: "top_padding"; relative: 0.0 1.0; }
-                               rel2 { to: "top_padding"; relative: 1.0 1.0; }
-                       }
-               }
-               part { name: "text_content_padding";
-                       type: SPACER;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               min: 0 10;
-                               align: 0.0 0.0;
-                               rel1 { to: "elm.text"; relative: 0.0 1.0; }
-                               rel2 { to: "elm.text"; relative: 1.0 1.0; }
-                       }
-               }
-               part { name: "elm.swallow.content";
-                       type: SWALLOW;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               align: 0.5 0.0;
-                               rel1 { to: "text_content_padding"; relative: 0.0 1.0; }
-                               rel2 { to: "bottom_padding"; relative: 1.0 0.0; }
-                       }
-               }
-               part { name: "bottom_padding";
-                       type: SPACER;
-                       scale: 1;
-                       description { state: "default" 0.0;
-                               min: 0 24;
-                               align: 0.5 1.0;
-                               rel1 { to: "base"; relative: 0.0 1.0; }
-                               rel2 { to: "base"; relative: 1.0 1.0; }
-                       }
-               }
-       }
-}

diff --git a/packaging/dpm-toolkit.spec b/packaging/dpm-toolkit.spec
index bfca5a6..66330a4 100755 (executable)
--- a/packaging/dpm-toolkit.spec
+++ b/packaging/dpm-toolkit.spec
@@ -42,7 +42,6 @@ make %{?jobs:-j%jobs}
 
 %post
 /sbin/ldconfig
-cp %{TZ_SYS_RO_APP}/org.tizen.dpm-toolkit/sampleapp.tpk /opt/data/dpm/
 ln -sf %{TZ_SYS_RO_APP}/org.tizen.dpm-toolkit/bin/org.tizen.dpm-toolkit /usr/bin/dpm-toolkit
 
 %postun
@@ -54,6 +53,5 @@ ln -sf %{TZ_SYS_RO_APP}/org.tizen.dpm-toolkit/bin/org.tizen.dpm-toolkit /usr/bin
 %{TZ_SYS_RO_APP}/org.tizen.dpm-toolkit/bin/*
 %{TZ_SYS_RO_APP}/org.tizen.dpm-toolkit/res/*
 %{TZ_SYS_RO_APP}/org.tizen.dpm-toolkit/dpm-toolkit.xml
-%{TZ_SYS_RO_APP}/org.tizen.dpm-toolkit/sampleapp.tpk
 %{TZ_SYS_RO_PACKAGES}/org.tizen.dpm-toolkit.xml
 %{TZ_SYS_RW_ICONS}/default/small/org.tizen.dpm-toolkit.png

diff --git a/res/org.tizen.dpm-toolkit.edc b/res/org.tizen.dpm-toolkit.edc
deleted file mode 100644 (file)
index 847003e..0000000
--- a/res/org.tizen.dpm-toolkit.edc
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License
- */
- 
-collections {
-       base_scale: 2.6;
-       #include "../edc_resource/genlist_custom.edc"
-}

diff --git a/src/application.c b/src/application.c
index a422b17..7044f51 100755 (executable)
--- a/src/application.c
+++ b/src/application.c
@@ -23,7 +23,7 @@ int install_package_handler(struct xtk_policy* self)
        char* pkgpath;
        device_policy_manager_h handle;
 
-       if (xtk_open_entry_popup(self, "/opt/data/dpm/sampleapp.tpk",
+       if (xtk_open_entry_popup(self, "/usr/apps/org.tizen.dpm-toolkit/res/sampleapp.tpk",
                                                                   "Enter package path",
                                                                   &pkgpath) == XTK_EVENT_CANCEL) {
                dlog_print(DLOG_DEBUG, LOG_TAG, "Entry get canceled");