[Title] applied on-demand installation path's change

[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Id1b75284c8d117ebf8343ff29e371726078efb9b

diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/OprofileCommonConstants.java b/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/OprofileCommonConstants.java
index 40c31fb..c10818c 100644 (file)
--- a/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/OprofileCommonConstants.java
+++ b/org.eclipse.linuxtools.oprofile.core/src/org/tizen/oprofile/core/OprofileCommonConstants.java
@@ -20,9 +20,11 @@
 
 package org.tizen.oprofile.core;
 
+import org.tizen.common.TizenPlatformConstants;
+
 public abstract class OprofileCommonConstants {
 
-       private static final String COMMAND_PATH = "/home/developer/sdk_tools/oprofile/usr/bin/";
+       private static final String COMMAND_PATH = TizenPlatformConstants.TOOLS_TARGET_PATH + "/oprofile/usr/bin/";
        
        public static final String COMMAND_OPCONTROL = COMMAND_PATH+"opcontrol";
        

diff --git a/org.eclipse.linuxtools.oprofile.launch.exe/src/org/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java b/org.eclipse.linuxtools.oprofile.launch.exe/src/org/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java
index ce4ea03..e3abb94 100644 (file)
--- a/org.eclipse.linuxtools.oprofile.launch.exe/src/org/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java
+++ b/org.eclipse.linuxtools.oprofile.launch.exe/src/org/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java
@@ -327,7 +327,7 @@ public class TizenOprofileLaunchDelegate extends TizenLaunchDelegate {
        public static void checkProfilingTool(IProgressMonitor monitor)
                        throws Exception {
                // find oprofile
-               String oprofileCmd = "/home/developer/sdk_tools/oprofile/usr/bin/opcontrol";
+               String oprofileCmd = TizenPlatformConstants.TOOLS_TARGET_PATH + "/oprofile/usr/bin/opcontrol";
                String cmd = "ls " + oprofileCmd + TizenPlatformConstants.CMD_SUFFIX;
                // String resultRsp = session.run(cmd, null);
                String[] resultRsp = CommandManager.runCommandReturningResultArray(cmd);
@@ -335,7 +335,7 @@ public class TizenOprofileLaunchDelegate extends TizenLaunchDelegate {
                        // if (CommandManager.isEmulator()) {
                        throw new Exception(TizenLaunchMessages.CANNOT_LAUNCH,
                                        new Exception(
-                                                       "No oprofile in this target (/home/developer/sdk_tools/oprofile/usr/bin/opcontrol)."));
+                                                       "No oprofile in this target (" + TizenPlatformConstants.TOOLS_TARGET_PATH + "/oprofile/usr/bin/opcontrol)."));
                        // } else {
                        // transferProfilingToolPackage(monitor);
                        // installProfilingToolPackage(monitor);

diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java
index d12e55c..05ad726 100644 (file)
--- a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java
+++ b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java
@@ -131,12 +131,12 @@ public class TizenValgrindLaunchDelegate extends TizenLaunchDelegate {
 
                try {
                        // find Valgrind executable
-                       String valgrindCmd = "/home/developer/sdk_tools/valgrind/usr/bin/valgrind";
+                       String valgrindCmd = TizenPlatformConstants.TOOLS_TARGET_PATH + "/valgrind/usr/bin/valgrind";
                        String cmd = "ls " + valgrindCmd + TizenPlatformConstants.CMD_SUFFIX;
                        String[] resultRsp = CommandManager.runCommandReturningResult(cmd);
                        if (!CommandManager.isRunSeccessfuly(resultRsp)) {
                                newCoreException(TizenLaunchMessages.CANNOT_LAUNCH,     new Exception(
-                                               "No valgrind in this target (/home/developer/sdk_tools/valgrind/usr/bin/valgrind)."));
+                                               "No valgrind in this target (" + TizenPlatformConstants.TOOLS_TARGET_PATH + "/valgrind/usr/bin/valgrind)."));
                        }
 
                        if (monitor.isCanceled())