From f837803b4c9ebaad5e72da20de7b83f08bb81df7 Mon Sep 17 00:00:00 2001 From: "yoonki.park" Date: Wed, 18 Jul 2012 20:05:52 +0900 Subject: [PATCH] [Title] remove nativecpp-eplugin dependency [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: I0d5ff2285ab312de71cb3872249a71ced0e9222f --- .../META-INF/MANIFEST.MF | 7 +++---- .../oprofile/launch/TizenOprofileLaunchDelegate.java | 13 +++++++------ .../META-INF/MANIFEST.MF | 7 +++---- .../valgrind/launch/TizenValgrindLaunchDelegate.java | 16 +++++++--------- .../META-INF/MANIFEST.MF | 4 +--- .../linuxtools/valgrind/massif/MassifLaunchDelegate.java | 4 ++-- .../valgrind/memcheck/MemcheckLaunchDelegate.java | 4 ++-- 7 files changed, 25 insertions(+), 30 deletions(-) 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 2da44b0..93c7dc2 100644 --- a/org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ 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, - org.tizen.nativecpp, org.tizen.common, - org.tizen.common.connection + org.tizen.common.connection, + org.tizen.nativecommon Bundle-Vendor: Eclipse Linux Tools Bundle-Version: 1.3.18.qualifier Bundle-Name: Tizen SDK Oprofile Exe Launch @@ -24,8 +24,7 @@ Import-Package: org.eclipse.cdt.debug.core, org.eclipse.linuxtools.oprofile.ui.view, org.eclipse.ui, org.tizen.nativecommon.launch, - org.tizen.nativecommon.launch.ui, - org.tizen.nativecpp.launch + org.tizen.nativecommon.launch.ui Bundle-SymbolicName: org.eclipse.linuxtools.oprofile.launch.exe;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Activator: org.tizen.oprofile.launch.Activator 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 8e02c6e..d964649 100644 --- 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 @@ -51,12 +51,14 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.tizen.common.TizenPlatformConstants; +import org.tizen.nativecommon.launch.IProjectLaunchCommand; +import org.tizen.nativecommon.launch.TizenLaunchDelegate; import org.tizen.nativecommon.launch.TizenLaunchMessages; -import org.tizen.nativecpp.launch.TizenCppLaunchDelegate; import org.tizen.oprofile.core.CommandManager; import org.tizen.sdblib.SdbShellProcess; +import org.tizen.nativecommon.ProjectUtil; -public class TizenOprofileLaunchDelegate extends TizenCppLaunchDelegate { +public class TizenOprofileLaunchDelegate extends TizenLaunchDelegate { protected static final String MAKE_DIRECTORY_CMD = "mkdir -p "; protected static final String CHANGE_DIRECTORY_CMD = "cd "; @@ -86,7 +88,7 @@ public class TizenOprofileLaunchDelegate extends TizenCppLaunchDelegate { activateProgressView(); verifyCProjectConfigurationSettings(config); - verifyDeviceReachability(getProject(config), + verifyDeviceReachability(ProjectUtil.getProject(config), new SubProgressMonitor(monitor, 9)); verifyBuildConfiguration(config, mode, new SubProgressMonitor( monitor, 11)); @@ -113,12 +115,11 @@ public class TizenOprofileLaunchDelegate extends TizenCppLaunchDelegate { ILaunchConfiguration config, IProgressMonitor monitor) throws CoreException { try { - setEnvironments(config); - // check oprofile tool checkProfilingTool(monitor); - String remoteExePath = getRemoteExePath(config); + IProjectLaunchCommand manifest = ProjectUtil.getProjectManifest(ProjectUtil.getProject(config)); + String remoteExePath = TizenPlatformConstants.APP_INSTALL_PATH + "/" + manifest.getPackageName() + "/bin/"; // String cmd = "cd " + remoteExePath + CMD_RESULT_CHECK; // // String resultRsp = session.run(cmd, null); // String[] resultRsp = CommandManager 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 870c8d1..d19a72e 100644 --- a/org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Require-Bundle: org.eclipse.ui, org.eclipse.cdt.core;bundle-version="5.2.1", org.eclipse.cdt.debug.core, org.eclipse.cdt.launch, - org.tizen.nativecpp, org.tizen.common, org.tizen.common.connection, org.eclipse.linuxtools.valgrind.core;bundle-version="1.3.18", org.eclipse.linuxtools.valgrind.ui;bundle-version="1.3.18", org.eclipse.linuxtools.valgrind.launch;bundle-version="1.3.18", - org.eclipse.linuxtools.profiling.launch;bundle-version="1.3.18" + org.eclipse.linuxtools.profiling.launch;bundle-version="1.3.18", + org.tizen.nativecommon Bundle-Vendor: Eclipse Linux Tools Bundle-Version: 1.3.18.qualifier Bundle-Localization: plugin @@ -22,7 +22,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.linuxtools.valgrind.launch Import-Package: org.eclipse.cdt.managedbuilder.core, org.tizen.nativecommon.launch, - org.tizen.nativecommon.launch.ui, - org.tizen.nativecpp.launch + org.tizen.nativecommon.launch.ui 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 234e498..2825aec 100644 --- 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 @@ -42,16 +42,17 @@ import org.eclipse.debug.core.ILaunchManager; import org.eclipse.linuxtools.valgrind.core.ValgrindCommand; import org.eclipse.linuxtools.valgrind.core.utils.LaunchConfigurationConstants; import org.eclipse.linuxtools.valgrind.ui.ValgrindUIPlugin; -import org.eclipse.linuxtools.valgrind.launch.IValgrindLaunchDelegate; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.tizen.common.TizenPlatformConstants; +import org.tizen.nativecommon.ProjectUtil; +import org.tizen.nativecommon.launch.IProjectLaunchCommand; +import org.tizen.nativecommon.launch.TizenLaunchDelegate; import org.tizen.nativecommon.launch.TizenLaunchMessages; -import org.tizen.nativecpp.launch.TizenCppLaunchDelegate; import org.tizen.sdblib.SdbShellProcess; -public class TizenValgrindLaunchDelegate extends TizenCppLaunchDelegate { +public class TizenValgrindLaunchDelegate extends TizenLaunchDelegate { protected static final String MAKE_DIRECTORY_CMD = "mkdir -p "; protected static final String CHANGE_DIRECTORY_CMD = "cd "; @@ -82,7 +83,7 @@ public class TizenValgrindLaunchDelegate extends TizenCppLaunchDelegate { activateProgressView(); verifyCProjectConfigurationSettings(config); - verifyDeviceReachability(getProject(config), + verifyDeviceReachability(ProjectUtil.getProject(config), new SubProgressMonitor(monitor, 9)); verifyBuildConfiguration(config, mode, new SubProgressMonitor( monitor, 11)); @@ -109,8 +110,6 @@ public class TizenValgrindLaunchDelegate extends TizenCppLaunchDelegate { // Process remoteShellProcess = null; try { - setEnvironments(config); - // find Valgrind String valgrindCmd = "/home/developer/sdk_tools/valgrind/usr/bin/valgrind"; String cmd = "ls " + valgrindCmd + TizenPlatformConstants.CMD_SUFFIX; @@ -127,8 +126,8 @@ public class TizenValgrindLaunchDelegate extends TizenCppLaunchDelegate { // installProfilingToolPackage(monitor); // } } - - String remoteExePath = getRemoteExePath(config); + IProjectLaunchCommand manifest = ProjectUtil.getProjectManifest(ProjectUtil.getProject(config)); + String remoteExePath = TizenPlatformConstants.APP_INSTALL_PATH + "/" + manifest.getPackageName() + "/bin/"; // cmd = "cd " + remoteExePath + CMD_RESULT_CHECK; // // resultRsp = session.run(cmd, null); // resultRsp = CommandManager.runCommandReturningResult(cmd); @@ -137,7 +136,6 @@ public class TizenValgrindLaunchDelegate extends TizenCppLaunchDelegate { // new Exception("Cannot change to run-directory : " // + ". (Return Code: " + resultRsp // + ", exepath: " + remoteExePath + ")")); - IPath exeFile = CDebugUtils.verifyProgramPath(config); remoteExePath += exeFile.toFile().getName(); // for bada application diff --git a/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF index 05898c8..603a446 100644 --- a/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF @@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.linuxtools.valgrind.core, org.eclipse.linuxtools.valgrind.launch, org.eclipse.linuxtools.valgrind.ui, - org.tizen.nativecpp, org.eclipse.linuxtools.valgrind.launch.exe Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy @@ -27,5 +26,4 @@ Export-Package: org.tizen.valgrind.massif.editor, org.eclipse.linuxtools.valgrind.massif.birt;uses:="org.eclipse.swt.events,org.eclipse.swt.widgets,org.eclipse.birt.chart.model" Import-Package: org.eclipse.cdt.core, org.eclipse.cdt.managedbuilder.core, - org.tizen.nativecommon.launch, - org.tizen.nativecpp.launch + org.tizen.nativecommon.launch diff --git a/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java b/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java index adabef5..d010c28 100644 --- a/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java +++ b/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java @@ -29,9 +29,9 @@ import org.eclipse.linuxtools.valgrind.launch.ValgrindLaunchPlugin; import org.eclipse.linuxtools.valgrind.ui.IValgrindToolView; import org.eclipse.linuxtools.valgrind.ui.ValgrindUIPlugin; import org.eclipse.linuxtools.valgrind.ui.ValgrindViewPart; -import org.tizen.nativecpp.launch.TizenCppLaunchDelegate; +import org.tizen.nativecommon.launch.TizenLaunchDelegate; -public class MassifLaunchDelegate extends TizenCppLaunchDelegate implements +public class MassifLaunchDelegate extends TizenLaunchDelegate implements IValgrindLaunchDelegate { // valgrind diff --git a/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckLaunchDelegate.java b/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckLaunchDelegate.java index 9202c65..f980d28 100644 --- a/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckLaunchDelegate.java +++ b/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckLaunchDelegate.java @@ -29,10 +29,10 @@ import org.eclipse.linuxtools.valgrind.launch.ValgrindLaunchPlugin; import org.eclipse.linuxtools.valgrind.ui.IValgrindToolView; import org.eclipse.linuxtools.valgrind.ui.ValgrindUIPlugin; import org.eclipse.linuxtools.valgrind.ui.ValgrindViewPart; -import org.tizen.nativecpp.launch.TizenCppLaunchDelegate; +import org.tizen.nativecommon.launch.TizenLaunchDelegate; import org.xml.sax.SAXException; -public class MemcheckLaunchDelegate extends TizenCppLaunchDelegate implements IValgrindLaunchDelegate { +public class MemcheckLaunchDelegate extends TizenLaunchDelegate implements IValgrindLaunchDelegate { // Valgrind program arguments public static final String OPT_LEAKCHECK = "--leak-check"; //$NON-NLS-1$ public static final String OPT_SHOWREACH = "--show-reachable"; //$NON-NLS-1$ -- 2.7.4