some changes in oprofile and valgrind plugins

(caused by changes of fresh ide)
1. modify path configuration of oprofile and valgrind tool
2. modify imported package name of freshide.common.ui

diff --git a/org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF
index cbec38c..6b46786 100644 (file)
--- a/org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0",
  org.eclipse.cdt.launch;bundle-version="5.0.2",\r
  org.eclipse.linuxtools.profiling.launch,\r
  com.samsung.freshide;bundle-version="1.0.0",\r
- com.samsung.freshide.connection;bundle-version="1.0.0"\r
+ com.samsung.freshide.connection;bundle-version="1.0.0",\r
+ com.samsung.freshide.common;bundle-version="1.3.20"\r
 Bundle-Vendor: Samsung Electronics\r
 Bundle-Version: 1.3.18.qualifier\r
 Bundle-Name: Native LiMo SDK Oprofile Exe Launch\r

diff --git a/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/linuxplatform/oprofile/launch/SLPOprofileLaunchDelegate.java b/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/linuxplatform/oprofile/launch/SLPOprofileLaunchDelegate.java
index ea36672..d0b80d2 100644 (file)
--- a/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/linuxplatform/oprofile/launch/SLPOprofileLaunchDelegate.java
+++ b/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/linuxplatform/oprofile/launch/SLPOprofileLaunchDelegate.java
@@ -9,7 +9,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.debug.core.DebugPlugin;
@@ -21,6 +20,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 
+import com.samsung.freshide.common.properties.InstallPathConfig;
 import com.samsung.freshide.connection.session.ISession;
 import com.samsung.freshide.launch.SLPLaunchDelegate;
 import com.samsung.freshide.launch.SLPLaunchMessages;
@@ -227,9 +227,8 @@ public class SLPOprofileLaunchDelegate extends SLPLaunchDelegate {
                        monitor.beginTask(Messages.getString("ProfileLaunch.TRANSFER_PROFILING_TOOL"), 1);
 
                        // test whether oprofile package exist or not
-//                     String sdkInstallPath = Platform.getInstallLocation().getURL().getPath();
-                       String sdkInstallPath = "/home/greatim/samsung_sdk/";
-                       String toolPkgPath = sdkInstallPath + "ext_package/" + PACKAGE_FILENAME_ARM;
+                       String sdkInstallPath = InstallPathConfig.getSDKPath();
+                       String toolPkgPath = sdkInstallPath + "/SDK/profiling-tool/" + PACKAGE_FILENAME_ARM;
                        File toolPkg = new File(toolPkgPath);
                        if(toolPkg == null || !toolPkg.exists())
                                newCoreException(Messages.getString("ProfileLaunch.FAIL_TO_TRANSFER"), null);

diff --git a/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/linuxplatform/oprofile/launch/configuration/NormalOprofileLaunchConfigurationTabGroup.java b/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/linuxplatform/oprofile/launch/configuration/NormalOprofileLaunchConfigurationTabGroup.java
index 42d06aa..82b704d 100644 (file)
--- a/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/linuxplatform/oprofile/launch/configuration/NormalOprofileLaunchConfigurationTabGroup.java
+++ b/org.eclipse.linuxtools.oprofile.launch.exe/src/com/samsung/linuxplatform/oprofile/launch/configuration/NormalOprofileLaunchConfigurationTabGroup.java
@@ -12,9 +12,9 @@ import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.linuxtools.oprofile.launch.configuration.OprofileEventConfigTab;
 import org.eclipse.linuxtools.profiling.launch.ProfileLaunchConfigurationTabGroup;
 
-import com.samsung.freshide.launch.SLPMainTab;
-import com.samsung.freshide.launch.SLPEnvironmentTab;
-import com.samsung.freshide.launch.SLPArgumentsTab;
+import com.samsung.freshide.launch.ui.SLPMainTab;
+import com.samsung.freshide.launch.ui.SLPEnvironmentTab;
+import com.samsung.freshide.launch.ui.SLPArgumentsTab;
 import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
 
 public class NormalOprofileLaunchConfigurationTabGroup extends ProfileLaunchConfigurationTabGroup {

diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF
index 71fc35e..410205d 100644 (file)
--- a/org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.linuxtools.valgrind.launch,\r
  org.eclipse.linuxtools.valgrind.ui,\r
  com.samsung.freshide;bundle-version="1.0.0",\r
- com.samsung.freshide.connection;bundle-version="1.0.0"\r
+ com.samsung.freshide.connection;bundle-version="1.0.0",\r
+ com.samsung.freshide.common;bundle-version="1.3.20"\r
 Bundle-Vendor: Samsung Electronics\r
 Bundle-Version: 1.3.18.qualifier\r
 Bundle-Localization: plugin\r

diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/SLPValgrindLaunchDelegate.java b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/SLPValgrindLaunchDelegate.java
index 629019b..1a56484 100644 (file)
--- a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/SLPValgrindLaunchDelegate.java
+++ b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/SLPValgrindLaunchDelegate.java
@@ -13,7 +13,6 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
@@ -31,6 +30,7 @@ import org.eclipse.linuxtools.valgrind.core.utils.LaunchConfigurationConstants;
 import com.samsung.freshide.connection.session.ISession;
 import com.samsung.freshide.launch.SLPLaunchDelegate;
 import com.samsung.freshide.launch.SLPLaunchMessages;
+import com.samsung.freshide.common.properties.InstallPathConfig;
 
 public class SLPValgrindLaunchDelegate extends SLPLaunchDelegate {
 
@@ -262,9 +262,8 @@ public class SLPValgrindLaunchDelegate extends SLPLaunchDelegate {
                        monitor.beginTask(Messages.getString("ProfileLaunch.TRANSFER_PROFILING_TOOL"), 1);
 
                        // test whether valgrind package exist or not
-//                     String sdkInstallPath = Platform.getInstallLocation().getURL().getPath();
-                       String sdkInstallPath = "/home/greatim/samsung_sdk/";
-                       String toolPkgPath = sdkInstallPath + "ext_package/" + PACKAGE_FILENAME_ARM;
+                       String sdkInstallPath = InstallPathConfig.getSDKPath();
+                       String toolPkgPath = sdkInstallPath + "/SDK/profiling-tool/" + PACKAGE_FILENAME_ARM;
                        File toolPkg = new File(toolPkgPath);
                        if(toolPkg == null || !toolPkg.exists())
                                newCoreException(Messages.getString("ProfileLaunch.FAIL_TO_TRANSFER"), null);

diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationTabGroup.java b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationTabGroup.java
index 2cab86e..dd5c0f6 100644 (file)
--- a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationTabGroup.java
+++ b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationTabGroup.java
@@ -11,9 +11,9 @@ import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.linuxtools.profiling.launch.ProfileLaunchConfigurationTabGroup;
 
-import com.samsung.freshide.launch.SLPMainTab;
-import com.samsung.freshide.launch.SLPArgumentsTab;
-import com.samsung.freshide.launch.SLPEnvironmentTab;
+import com.samsung.freshide.launch.ui.SLPMainTab;
+import com.samsung.freshide.launch.ui.SLPArgumentsTab;
+import com.samsung.freshide.launch.ui.SLPEnvironmentTab;
 
 public class ValgrindLaunchConfigurationTabGroup extends ProfileLaunchConfigurationTabGroup {