Upload tizen_2.2 source

Change-Id: I7f71c45e370973351791a51da0fc83f55a7e9345

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/PlatformLaunchDelegate.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/PlatformLaunchDelegate.java
index f4963d8..edf5da7 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/PlatformLaunchDelegate.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/PlatformLaunchDelegate.java
@@ -181,8 +181,6 @@ public class PlatformLaunchDelegate extends AbstractCLaunchDelegate {
 
     protected void setConfiguration(ILaunchConfiguration config, String mode,
             IProgressMonitor monitor)
-    // protected void setConfigIfNotFromShortcut(ILaunchConfiguration config,
-    // String mode, IProgressMonitor monitor)
             throws CoreException {
         installPackages(config, mode, monitor);
     }

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/PlatformProjectAttachLaunchShortcut.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/PlatformProjectAttachLaunchShortcut.java
index fc0690a..88476aa 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/PlatformProjectAttachLaunchShortcut.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/PlatformProjectAttachLaunchShortcut.java
@@ -77,6 +77,7 @@ import org.tizen.nativecommon.launch.TizenLaunchConfigurationConstants;
 import org.tizen.nativecommon.launch.TizenLaunchMessages;
 import org.tizen.nativeplatform.build.PlatformConfigurationManager;
 import org.tizen.nativeplatform.launch.ITizenLaunchConfigurationConstants;
+import org.tizen.nativeplatform.launch.PlatformLaunchMessages;
 import org.tizen.nativeplatform.launch.wizards.PlatformAttachLaunchWizard;
 import org.tizen.nativeplatform.launch.wizards.PlatformLaunchUtils;
 import org.tizen.nativeplatform.launch.wizards.PlatformLaunchWizardDialog;
@@ -120,6 +121,10 @@ public class PlatformProjectAttachLaunchShortcut extends CApplicationLaunchShort
             DialogUtil.openErrorDialog(TizenLaunchMessages.CANNOT_CONNECT_TO_DEVICE);
             return;
         }
+        if (!device.isRoot()) {
+            DialogUtil.openErrorDialog(PlatformLaunchMessages.DEVICE_IS_NOT_ROOT_ON);
+            return;
+        }
 
         if (elements != null && elements.length > 0) {
             int nElements = elements.length;

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/PlatformProjectLaunchShortcut.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/PlatformProjectLaunchShortcut.java
index d98f326..9518701 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/PlatformProjectLaunchShortcut.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/ui/shortcut/PlatformProjectLaunchShortcut.java
@@ -77,6 +77,7 @@ import org.tizen.nativecommon.launch.TizenLaunchConfigurationConstants;
 import org.tizen.nativecommon.launch.TizenLaunchMessages;
 import org.tizen.nativeplatform.build.PlatformConfigurationManager;
 import org.tizen.nativeplatform.launch.ITizenLaunchConfigurationConstants;
+import org.tizen.nativeplatform.launch.PlatformLaunchMessages;
 import org.tizen.nativeplatform.launch.wizards.PlatformLaunchUtils;
 import org.tizen.nativeplatform.launch.wizards.PlatformLaunchWizard;
 import org.tizen.nativeplatform.launch.wizards.PlatformLaunchWizardDialog;
@@ -125,6 +126,10 @@ public class PlatformProjectLaunchShortcut extends CApplicationLaunchShortcut {
             DialogUtil.openErrorDialog(TizenLaunchMessages.CANNOT_CONNECT_TO_DEVICE);
             return;
         }
+        if (!device.isRoot()) {
+            DialogUtil.openErrorDialog(PlatformLaunchMessages.DEVICE_IS_NOT_ROOT_ON);
+            return;
+        }
 
         if (elements != null && elements.length > 0) {
             int nElements = elements.length;

diff --git a/package/changelog b/package/changelog
index 7ac81eb..4ed13ca 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,9 @@
+* 2.1.17
+- Check if device is root before launching launch wizard
+== donghyuk yang <donghyuk.yang@samsung.com> 2013-06-24
+* 2.1.16
+- Added default include path
+== donghyuk yang <donghyuk.yang@samsung.com> 2013-06-24
 * 2.1.15
 - Added platform_includes.xml file for setting include path to platform project as default
 - Supported header tracing (set default includes from xml)

diff --git a/package/extrafiles/platform_includes.xml b/package/extrafiles/platform_includes.xml
index 39d87da..a2dcc9f 100644 (file)
--- a/package/extrafiles/platform_includes.xml
+++ b/package/extrafiles/platform_includes.xml
@@ -56,6 +56,14 @@
 <includepath>${SBI_SYSROOT}/usr/include/sys</includepath>
 <includepath>${SBI_SYSROOT}/usr/include/video</includepath>
 <includepath>${SBI_SYSROOT}/usr/include/xen</includepath>
+<includepath>${SBI_SYSROOT}/usr/include/eina-1</includepath>
+<includepath>${SBI_SYSROOT}/usr/include/aul</includepath>
+<includepath>${SBI_SYSROOT}/usr/include/rua</includepath>
+<includepath>${SBI_SYSROOT}/usr/include/vconf</includepath>
+<includepath>${SBI_SYSROOT}/usr/include/appcore</includepath>
+<includepath>${SBI_SYSROOT}/usr/include/sysman</includepath>
+<includepath>${SBI_SYSROOT}/usr/include/feedback</includepath>
+<includepath>${SBI_SYSROOT}/usr/include/c++/4.5.3/tr1</includepath>
 
 </language>
 </section>

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 76c0c18..3d37ec3 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.15
+Version:2.1.17
 Source:nativeplatform-eplugin
 Maintainer:Kangho Kim <kh5325.kim@samsung.com>, Yoonki Park<yoonki.park@samsung.com>, Hyunsik Noh<hyunsik.noh@samsung.com>, Gun Kim<gune.kim@samsung.com>, Ho Namkoong<ho.namkoong@samsung.com>, Taeyoung Son<taeyoung2.son@samsung.com>