[Title] Modified feature's description

[Desc.]
[Issue] http://172.21.17.25/redmine/issues/6998

Change-Id: If9587f118c2adb45350fbc7ff377c5b2bc071fb2

diff --git a/org.tizen.common.feature/feature.xml b/org.tizen.common.feature/feature.xml
index 71fb7d8..58ea7db 100644 (file)
--- a/org.tizen.common.feature/feature.xml
+++ b/org.tizen.common.feature/feature.xml
@@ -1,21 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<feature\r
-      id="org.tizen.common.feature"\r
-      label="Tizen Common Tools"\r
-      version="1.0.0.qualifier"\r
-      provider-name="Tizen"\r
-      plugin="org.tizen.base.platform"\r
-      license-feature="org.tizen.base.feature">\r
-\r
-   <description>\r
-      Common library for Tizen SDK.\r
-   </description>\r
-\r
-   <copyright>\r
-      Copyright (c)\r
-   </copyright>\r
-\r
-   <license url="license.html">\r
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.tizen.common.feature"
+      version="1.0.0.qualifier"
+      plugin="org.tizen.common"
+      license-feature="org.tizen.base.feature">
+
+   <description>
+      Common library for Tizen SDK.
+   </description>
+
+   <copyright>
+      Copyright (c)
+   </copyright>
+
+   <license url="license.html">
       Tizen SDK
 
 Tizen SDK contains software portions licensed under various open source licenses as well as proprietary components.  All open source software portions (&quot;Open Source Software&quot;) are licensed under the open source licenses that accompany such Open Source Software.
@@ -26,29 +24,29 @@ Except for the Open Source Software contained in Tizen SDK, all other software p
 
 You may access and download Tizen SDK Open Source Software at: http://developer.tizen.org/download/tizenopensdk.tar.gz
 
-BY CLICKING THE &quot;I AGREE&quot; BUTTON OR BY USING ANY PART OF TIZEN SDK, YOU AGREE (ON BEHALF OF YOURSELF AND/OR YOUR COMPANY) TO THE OPEN SOURCE SOFTWARE LICENSE TERMS AND THE TIZEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT. IF YOU DO NOT AGREE WITH THE OPEN SOURCE SOFTWARE LICENSE TERMS OR THE TIZEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT, YOU MAY NOT DOWNLOAD OR USE TIZEN SDK.\r
-   </license>\r
-\r
-   <plugin\r
-         id="org.tizen.common"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.tizen.common.connection"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
-\r
-   <plugin\r
-         id="org.tizen.common.externals"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         unpack="false"/>\r
+BY CLICKING THE &quot;I AGREE&quot; BUTTON OR BY USING ANY PART OF TIZEN SDK, YOU AGREE (ON BEHALF OF YOURSELF AND/OR YOUR COMPANY) TO THE OPEN SOURCE SOFTWARE LICENSE TERMS AND THE TIZEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT. IF YOU DO NOT AGREE WITH THE OPEN SOURCE SOFTWARE LICENSE TERMS OR THE TIZEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT, YOU MAY NOT DOWNLOAD OR USE TIZEN SDK.
+   </license>
+
+   <plugin
+         id="org.tizen.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.tizen.common.connection"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.tizen.common.externals"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.tizen.common.verrari"

diff --git a/org.tizen.common/32_TIZEN_SDK_icon.png b/org.tizen.common/32_TIZEN_SDK_icon.png
new file mode 100644 (file)
index 0000000..e511542
Binary files /dev/null and b/org.tizen.common/32_TIZEN_SDK_icon.png differ

diff --git a/org.tizen.common/OSGI-INF/l10n/bundle.properties b/org.tizen.common/OSGI-INF/l10n/bundle.properties
index c4bd08c..e46bea9 100644 (file)
--- a/org.tizen.common/OSGI-INF/l10n/bundle.properties
+++ b/org.tizen.common/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,4 @@
-Bundle-Vendor = Samsung Electronics
+Bundle-Vendor = Tizen SDK
 
 activity.name = newXsdDisabler
 activity.name.0 = newDtdDisabler
@@ -23,4 +23,4 @@ activity.name.6 = PopupMenus
 category.name.2 = Tizen
 category.name.3 = Tizen
 extension-point.name = Prompter
-Bundle-Name = Tizen Common
\ No newline at end of file
+Bundle-Name = Tizen SDK Common Tools
\ No newline at end of file

diff --git a/org.tizen.common/about.ini b/org.tizen.common/about.ini
new file mode 100644 (file)
index 0000000..fc8fa16
--- /dev/null
+++ b/org.tizen.common/about.ini
@@ -0,0 +1,32 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=32_TIZEN_SDK_icon.png
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# welcomePage=$nl$/welcome.xml
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
+
+# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
+# optional
+# tipsAndTricksHref=/org.tizen.doc.user/tips/tizen_tips.htm
+

diff --git a/org.tizen.common/about.mappings b/org.tizen.common/about.mappings
new file mode 100644 (file)
index 0000000..361d43c
--- /dev/null
+++ b/org.tizen.common/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties and bundle.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+0=Tzen SDK Common Tools
+1=date-time

diff --git a/org.tizen.common/about.properties b/org.tizen.common/about.properties
new file mode 100644 (file)
index 0000000..5c2e80a
--- /dev/null
+++ b/org.tizen.common/about.properties
@@ -0,0 +1,12 @@
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+
+blurb={0}\n\
+\n\
+Version : {featureVersion}\n\
+Build id : {1}\n\
+\n\
+Visit https://developer.tizen.org \n
\ No newline at end of file

diff --git a/org.tizen.common/build.properties b/org.tizen.common/build.properties
index 49d1a30..b5a8567 100755 (executable)
--- a/org.tizen.common/build.properties
+++ b/org.tizen.common/build.properties
@@ -13,6 +13,10 @@ bin.includes = META-INF/,\
                lib/commons-pool-1.6.jar,\\r
                OSGI-INF/,\\r
                OSGI-INF/l10n/bundle.properties,\\r
-               lib/commons-logging-1.1.1.jar\r
+               lib/commons-logging-1.1.1.jar,\\r
+               32_TIZEN_SDK_icon.png,\\r
+               about.ini,\\r
+               about.properties,\\r
+               about.mappings\r
 javacSource = 1.6
 javacTarget = 1.6

diff --git a/package/build.linux b/package/build.linux
index 06e3dee..214d2bc 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -12,23 +12,7 @@ __copy_necessary_binaries()
 __set_parameter()
 {
     echo "TARGET_OS : ${TARGET_OS}"
-    case ${TARGET_OS} in
-        ubuntu-32|ubuntu-64)
-            pde_path=${ROOTDIR}/indigo-pde
-            ;;
-        windows-32|windows-64)
-            pde_path=${ROOTDIR}/indigo-winpde
-            ;;
-        macos-64)
-            pde_path=${ROOTDIR}/indigo-macpde
-            ;;
-        *)
-            echo "${TARGET_OS} is not support yet."
-            exit 1
-            ;;
-    esac
-    
-    build_script_path=${pde_path}/pde_build
+    build_script_path=${ROOTDIR}/pde-build
 }
 
 # clean

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 83d9777..9b72851 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -5,35 +5,35 @@ Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung
 Package:common-eplugin
 OS:ubuntu-32
 Build-host-os:ubuntu-32
-Build-dependency:indigo-pde [ubuntu-32], base-ide-product [ubuntu-32]
+Build-dependency:base-ide-product [ubuntu-32], pde-build [ubuntu-32]
 Install-dependency:base-ide-product [ubuntu-32]
 Description:Common plugin
 
 Package:common-eplugin
 OS:windows-32
 Build-host-os:ubuntu-32
-Build-dependency:indigo-winpde [windows-32], base-ide-product [windows-32]
+Build-dependency:base-ide-product [windows-32], pde-build [windows-32]
 Install-dependency:base-ide-product [windows-32]
 Description:Common plugin
 
 Package:common-eplugin
 OS:ubuntu-64
 Build-host-os:ubuntu-64
-Build-dependency:indigo-pde [ubuntu-64], base-ide-product [ubuntu-64]
+Build-dependency:base-ide-product [ubuntu-64], pde-build [ubuntu-64]
 Install-dependency:base-ide-product [ubuntu-64]
 Description:Common plugin
 
 Package:common-eplugin
 OS:windows-64
 Build-host-os:ubuntu-64
-Build-dependency:indigo-winpde [windows-64], base-ide-product [windows-64]
+Build-dependency:base-ide-product [windows-64], pde-build [windows-64]
 Install-dependency:base-ide-product [windows-64]
 Description:Common plugin
 
 Package:common-eplugin
 OS:macos-64
 Build-host-os:ubuntu-64
-Build-dependency:indigo-macpde [macos-64], base-ide-product [macos-64]
+Build-dependency:base-ide-product [macos-64], pde-build [macos-64]
 Install-dependency:base-ide-product [macos-64]
 Description:Common plugin