From: wonhyoung2.park Date: Sat, 3 Dec 2011 11:54:29 +0000 (+0900) Subject: [TITLE] package instll routine chage X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4d332a3446f2dc37ad08a74a6ec9375a5de437d;p=sdk%2Fide%2Fprofiler-eplugin.git [TITLE] package instll routine chage [Type] [Module] Profile [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- diff --git a/builder/metadata/data/SDK/develop-tool/libc6-dbg_0.0.1_armel.tar b/builder/metadata/data/SDK/develop-tool/libc6-dbg_0.0.1_armel.tar new file mode 100644 index 0000000..b2ba905 Binary files /dev/null and b/builder/metadata/data/SDK/develop-tool/libc6-dbg_0.0.1_armel.tar differ diff --git a/builder/metadata/data/SDK/develop-tool/libc6-dbg_armel.tar b/builder/metadata/data/SDK/develop-tool/libc6-dbg_armel.tar deleted file mode 100644 index 2925303..0000000 Binary files a/builder/metadata/data/SDK/develop-tool/libc6-dbg_armel.tar and /dev/null differ diff --git a/builder/metadata/data/SDK/develop-tool/oprofile_armel.tar b/builder/metadata/data/SDK/develop-tool/oprofile_0.0.1_armel.tar similarity index 55% rename from builder/metadata/data/SDK/develop-tool/oprofile_armel.tar rename to builder/metadata/data/SDK/develop-tool/oprofile_0.0.1_armel.tar index 480db39..d9a0741 100644 Binary files a/builder/metadata/data/SDK/develop-tool/oprofile_armel.tar and b/builder/metadata/data/SDK/develop-tool/oprofile_0.0.1_armel.tar differ diff --git a/builder/metadata/data/SDK/develop-tool/valgrind_armel.tar b/builder/metadata/data/SDK/develop-tool/valgrind_0.0.1_armel.tar similarity index 56% rename from builder/metadata/data/SDK/develop-tool/valgrind_armel.tar rename to builder/metadata/data/SDK/develop-tool/valgrind_0.0.1_armel.tar index 4ac66c6..0e6f375 100644 Binary files a/builder/metadata/data/SDK/develop-tool/valgrind_armel.tar and b/builder/metadata/data/SDK/develop-tool/valgrind_0.0.1_armel.tar differ diff --git a/com.samsung.tizen.profiler.feature/feature.xml b/com.samsung.tizen.profiler.feature/feature.xml index 2c91c6b..29cc2b0 100644 --- a/com.samsung.tizen.profiler.feature/feature.xml +++ b/com.samsung.tizen.profiler.feature/feature.xml @@ -23,56 +23,6 @@ id="org.eclipse.birt.chart" version="0.0.0"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/CommandManager.java b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/CommandManager.java index fa75380..e46502f 100644 --- a/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/CommandManager.java +++ b/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/oprofile/core/CommandManager.java @@ -55,10 +55,25 @@ class OneStringReceiver extends MultiLineReceiver { } public class CommandManager { + + private static String getRealTargetPath(String path) { + if (ConnectionPlugin.getDefault().getCurrentDevice().isEmulator()) { + return path; + } + if (path.contains("/usr/bin")) { + path = path + .replace("/usr/bin", "/home/developer/sdk_tools/oprofile/usr/bin"); + } + return path; + } + public static void runShell(String command) { IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); SdbShellProcess sdbShellProc = null; BufferedReader br = null; + + command = getRealTargetPath(command); + try { sdbShellProc = device.executeShellCommand(command); br = new BufferedReader(new InputStreamReader( @@ -83,6 +98,9 @@ public class CommandManager { public static String runCommandReturningResult(String command) { IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); OneStringReceiver oneStringReceiver = new OneStringReceiver(); + + command = getRealTargetPath(command); + try { device.executeShellCommand(command, oneStringReceiver); } catch (TimeoutException e) { @@ -100,6 +118,9 @@ public class CommandManager { public static String[] runCommandReturningResultArray(String command) { IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); CommonReceiver commonReceiver = new CommonReceiver(); + + command = getRealTargetPath(command); + try { device.executeShellCommand(command, commonReceiver); } catch (TimeoutException e) { @@ -115,6 +136,9 @@ public class CommandManager { } public static void runCommand(String command) { + + command = getRealTargetPath(command); + try { ConnectionPlugin.getDefault().getCurrentDevice() .executeShellCommand(command); 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 510f196..3b4cf79 100644 --- a/org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0", org.eclipse.linuxtools.oprofile.launch, org.eclipse.debug.ui;bundle-version="3.4.2", org.eclipse.linuxtools.profiling.launch, - com.samsung.tizen.nativeapp;bundle-version="1.0.0", - com.samsung.tizen.common;bundle-version="1.3.20" + com.samsung.tizen.nativeapp, + com.samsung.tizen.common Bundle-Vendor: Eclipse Linux Tools Bundle-Version: 1.3.18.qualifier Bundle-Name: Tizen SDK Oprofile Exe Launch diff --git a/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF index d97622f..c2c6139 100644 --- a/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.oprofile.launch/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.4.0", org.eclipse.cdt.launch;bundle-version="5.0.1", org.eclipse.cdt.debug.core;bundle-version="5.0.1", org.eclipse.linuxtools.oprofile.core, - com.samsung.tizen.common;bundle-version="1.3.20", - com.samsung.tizen.common.connection;bundle-version="1.0.0" + com.samsung.tizen.common, + com.samsung.tizen.common.connection Bundle-Vendor: Eclipse Linux Tools Bundle-ActivationPolicy: lazy Bundle-Version: 1.3.18.qualifier diff --git a/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF index db80dca..746ab5a 100644 --- a/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.oprofile.ui/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.4.0", org.eclipse.jface.text;bundle-version="3.4.2", org.eclipse.linuxtools.oprofile.core, org.eclipse.linuxtools.profiling.ui, - com.samsung.tizen.common;bundle-version="1.3.20" + com.samsung.tizen.common Bundle-Activator: org.eclipse.linuxtools.oprofile.ui.OprofileUiPlugin Bundle-ActivationPolicy: lazy Bundle-Localization: plugin 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 36b9f60..0bf23b3 100644 --- a/org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF @@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.linuxtools.valgrind.core, org.eclipse.linuxtools.valgrind.launch, org.eclipse.linuxtools.valgrind.ui, - com.samsung.tizen.nativeapp;bundle-version="1.0.0", - com.samsung.tizen.common;bundle-version="1.3.20", - com.samsung.tizen.common.connection;bundle-version="1.0.0" + com.samsung.tizen.nativeapp, + com.samsung.tizen.common, + com.samsung.tizen.common.connection Bundle-Vendor: Eclipse Linux Tools Bundle-Version: 1.3.18.qualifier Bundle-Localization: plugin diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/plugin.xml b/org.eclipse.linuxtools.valgrind.launch.exe/plugin.xml index 4fe9b47..478e40d 100644 --- a/org.eclipse.linuxtools.valgrind.launch.exe/plugin.xml +++ b/org.eclipse.linuxtools.valgrind.launch.exe/plugin.xml @@ -102,4 +102,20 @@ + + + + + + + + diff --git a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/CommandManager.java b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/CommandManager.java index c8fe453..4577e6b 100644 --- a/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/CommandManager.java +++ b/org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/CommandManager.java @@ -29,10 +29,28 @@ class CommonReceiver extends MultiLineReceiver { } public class CommandManager { + private static String getRealTargetPath(String path) { + if (ConnectionPlugin.getDefault().getCurrentDevice().isEmulator()) { + return path; + } + if (path.contains("/usr/bin")) { + path = path + .replace("/usr/bin", "/home/developer/sdk_tools/valgrind/usr/bin"); + } + if (path.contains("/opt/Valgrind_XML")) { + path = path.replace("/opt/Valgrind_XML", + "/home/developer/sdk_tools/valgrind/opt/Valgrind_XML"); + } + return path; + } + public static String runShell(String command) { IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); SdbShellProcess sdbShellProc = null; BufferedReader br = null; + + command = getRealTargetPath(command); + try { sdbShellProc = device.executeShellCommand(command); br = new BufferedReader(new InputStreamReader( @@ -56,6 +74,9 @@ public class CommandManager { public static String[] runCommandReturningResult(String command) { IDevice device = ConnectionPlugin.getDefault().getCurrentDevice(); CommonReceiver commonReceiver = new CommonReceiver(); + + command = getRealTargetPath(command); + try { device.executeShellCommand(command, commonReceiver); } catch (TimeoutException e) { @@ -71,6 +92,9 @@ public class CommandManager { } public static void runCommand(String command) { + + command = getRealTargetPath(command); + try { ConnectionPlugin.getDefault().getCurrentDevice() .executeShellCommand(command); @@ -83,6 +107,9 @@ public class CommandManager { public static boolean pull(String src, String dest) { SyncService syncService = null; + + src = getRealTargetPath(src); + try { syncService = ConnectionPlugin.getDefault().getCurrentDevice() .getSyncService(); diff --git a/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF index 73fb75e..23c6d0f 100644 --- a/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.linuxtools.valgrind.core, org.eclipse.linuxtools.valgrind.launch, org.eclipse.linuxtools.valgrind.ui, - com.samsung.tizen.nativeapp;bundle-version="1.0.0", + com.samsung.tizen.nativeapp, org.eclipse.linuxtools.valgrind.launch.exe;bundle-version="1.3.18" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF index bfdf00b..7fccc87 100644 --- a/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.ui, org.eclipse.linuxtools.valgrind.core, org.eclipse.linuxtools.valgrind.launch, org.eclipse.linuxtools.valgrind.ui, - com.samsung.tizen.nativeapp;bundle-version="1.0.0", - com.samsung.tizen.common;bundle-version="1.3.20", - org.eclipse.linuxtools.valgrind.launch.exe;bundle-version="1.3.18" + com.samsung.tizen.nativeapp, + org.eclipse.linuxtools.valgrind.launch.exe;bundle-version="1.3.18", + com.samsung.tizen.common Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF index f76541e..22435d1 100644 --- a/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.valgrind.ui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.linuxtools.valgrind.ui.ValgrindUIPlugin Bundle-Vendor: Eclipse Linux Tools Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - com.samsung.tizen.common;bundle-version="1.3.20" + com.samsung.tizen.common Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.linuxtools.valgrind.ui