summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2016-03-24 17:02:38 +0100
committerLukasz Stanislawski <l.stanislaws@samsung.com>2016-03-30 13:40:14 -0700
commitcb61fc626e1b445a3cfeeddc6a6f0851ebcae1e2 (patch)
tree543622f2014b5d7ce6ad947ad0388344b519ea31
parent43129501c2772e36ea0b2902aee14f84f448a828 (diff)
downloadshare-panel-cb61fc626e1b445a3cfeeddc6a6f0851ebcae1e2.tar.gz
share-panel-cb61fc626e1b445a3cfeeddc6a6f0851ebcae1e2.tar.bz2
share-panel-cb61fc626e1b445a3cfeeddc6a6f0851ebcae1e2.zip
Use same manifest for SDK and gbs builds
Change-Id: Ic06be6ed135f0bedb60330083516784930a1d366
-rw-r--r--CMake/CMakeLists.txt2
-rw-r--r--org.tizen.share-panel.xml16
2 files changed, 1 insertions, 17 deletions
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index d1487e9..c2284a1 100644
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -59,7 +59,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${MENU_PKGS_LDFLAGS})
# Install
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${INSTALL_EXEC_PREFIX})
-INSTALL(FILES ${PROJECT_ROOT_DIR}/org.tizen.share-panel.xml DESTINATION ${SYS_PACKAGES_DIR})
+INSTALL(FILES ${PROJECT_ROOT_DIR}/tizen-manifest.xml DESTINATION ${SYS_PACKAGES_DIR} RENAME org.tizen.share-panel.xml)
INSTALL(DIRECTORY DESTINATION ${PREFIX}/data)
INSTALL(FILES ${PROJECT_ROOT_DIR}/shared/res/share-panel.png DESTINATION ${SYS_ICONS_DIR})
diff --git a/org.tizen.share-panel.xml b/org.tizen.share-panel.xml
deleted file mode 100644
index cd333b5..0000000
--- a/org.tizen.share-panel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.share-panel" version="0.1.0" install-location="internal-only" api-version="3.0">
- <label>share-panel</label>
- <author email="jinny.yoon@samsung.com" href="www.samsung.com">Jin Yoon</author>
- <author email="moon87.park@samsung.com" href="www.samsung.com">Moonkyoung Park</author>
- <description>SHARE PANEL APPLICATION</description>
- <ui-application appid="org.tizen.share-panel" exec="/usr/apps/org.tizen.share-panel/bin/share-panel" nodisplay="true" multiple="false" type="capp" taskmanage="false" launch_mode="group">
- <label>Share panel</label>
- <label xml:lang="en-us">Share panel</label>
- </ui-application>
- <privileges>
- <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
- <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
- </privileges>
-
-</manifest>