[Esbox-commits] r408 - in trunk: org.indt.esbox.debug/src/org/indt/esbox/debug/internal org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile org.indt.esbox.launch/src/org/indt/esbox/launch/valgrind org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/valgrind org.indt.esbox.ui/src/org/indt/esbox/ui/views

raul at garage.maemo.org raul at garage.maemo.org
Fri Feb 15 02:15:10 EET 2008


Author: raul
Date: 2008-02-15 02:14:59 +0200 (Fri, 15 Feb 2008)
New Revision: 408

Modified:
   trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/internal/ESboxMIProcessAdapter.java
   trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile/OProfileLaunchDelegate.java
   trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile/OProfileLaunchShortcut.java
   trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/valgrind/ValgrindLaunchShortcut.java
   trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile/OProfilePythonConfigurationDelegate.java
   trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile/OProfilePythonShortcut.java
   trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/valgrind/ValgrindPythonConfigurationDelegate.java
   trunk/org.indt.esbox.ui/src/org/indt/esbox/ui/views/OProfileView.java
Log:
fixing bugs before release beta version

Modified: trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/internal/ESboxMIProcessAdapter.java
===================================================================
--- trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/internal/ESboxMIProcessAdapter.java	2008-02-14 19:38:59 UTC (rev 407)
+++ trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/internal/ESboxMIProcessAdapter.java	2008-02-15 00:14:59 UTC (rev 408)
@@ -68,12 +68,8 @@
 
 		Path command = null;
 		
-		if (runStandalone) {
-			command = new Path("run-standalone.sh " + args[0]);
-		} else {
-			command = new Path(args[0]);
-		}
-
+		command = new Path(args[0]);
+		
 		final Process pgdb = launcher.execute(command, tail, new String[] {},
 				new Path("."));
 		

Modified: trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile/OProfileLaunchDelegate.java
===================================================================
--- trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile/OProfileLaunchDelegate.java	2008-02-14 19:38:59 UTC (rev 407)
+++ trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile/OProfileLaunchDelegate.java	2008-02-15 00:14:59 UTC (rev 408)
@@ -116,7 +116,7 @@
 		
 		IPath command = new Path(prefs.getString(ESboxPreferenceConstants.SBRSH_EXEC_FILE_LOCATION.toString()));
 		ESboxCommonCommandLauncher launcher = new ESboxCommonCommandLauncher();
-		String program = isRunStandalone ? "run-standalone.sh " : "" + "./" + exePath.lastSegment();
+		String program = ( isRunStandalone ? "run-standalone.sh " : "" ) + "./" + exePath.lastSegment();
 		String args[] = new String[] { "-d", remoteMounPoint,  program };	
 		
 		String password = promptPassword();

Modified: trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile/OProfileLaunchShortcut.java
===================================================================
--- trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile/OProfileLaunchShortcut.java	2008-02-14 19:38:59 UTC (rev 407)
+++ trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/oprofile/OProfileLaunchShortcut.java	2008-02-15 00:14:59 UTC (rev 408)
@@ -51,7 +51,7 @@
 	
 	@Override
 	protected ILaunchConfigurationType getCLaunchConfigType() {		
-		return getLaunchManager().getLaunchConfigurationType(""); //the ID of the configuration type that we want to link with.
+		return getLaunchManager().getLaunchConfigurationType("esboxOprofileLaunchType"); //the ID of the configuration type that we want to link with.
 	}	
 
 }

Modified: trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/valgrind/ValgrindLaunchShortcut.java
===================================================================
--- trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/valgrind/ValgrindLaunchShortcut.java	2008-02-14 19:38:59 UTC (rev 407)
+++ trunk/org.indt.esbox.launch/src/org/indt/esbox/launch/valgrind/ValgrindLaunchShortcut.java	2008-02-15 00:14:59 UTC (rev 408)
@@ -51,7 +51,7 @@
 
 	@Override
 	protected ILaunchConfigurationType getCLaunchConfigType() {		
-		return getLaunchManager().getLaunchConfigurationType(""); //the ID of the configuration type that we want to link with.
+		return getLaunchManager().getLaunchConfigurationType("esboxValgrindLaunchType"); //the ID of the configuration type that we want to link with.
 	}	
 	
 }

Modified: trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile/OProfilePythonConfigurationDelegate.java
===================================================================
--- trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile/OProfilePythonConfigurationDelegate.java	2008-02-14 19:38:59 UTC (rev 407)
+++ trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile/OProfilePythonConfigurationDelegate.java	2008-02-15 00:14:59 UTC (rev 408)
@@ -110,7 +110,7 @@
 		
 		IPath command = new Path(prefs.getString(ESboxPreferenceConstants.SBRSH_EXEC_FILE_LOCATION.toString()));
 		ESboxCommonCommandLauncher launcher = new ESboxCommonCommandLauncher();
-		String program = isRunStandalone ? "run-standalone.sh " : "" + "./" + exePath.lastSegment();
+		String program = (isRunStandalone ? "run-standalone.sh " : "") + "python " + "./" + exePath.lastSegment();
 		String args[] = new String[] { "-d", remoteMounPoint,  program };	
 		
 		String password = promptPassword();

Modified: trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile/OProfilePythonShortcut.java
===================================================================
--- trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile/OProfilePythonShortcut.java	2008-02-14 19:38:59 UTC (rev 407)
+++ trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/oprofile/OProfilePythonShortcut.java	2008-02-15 00:14:59 UTC (rev 408)
@@ -10,38 +10,14 @@
  *******************************************************************************/
 package org.indt.esbox.python.launch.oprofile;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.cdt.core.model.AbstractLanguage;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.CommonTab;
 import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 import org.indt.esbox.python.launch.AbstractLaunchShortcut;
 import org.indt.esbox.python.launch.PythonLaunchActivator;
 import org.indt.esbox.python.launch.internal.core.ESboxPythonLaunchConstants;
-import org.python.pydev.ui.NotConfiguredInterpreterException;
 
 /**
  *

Modified: trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/valgrind/ValgrindPythonConfigurationDelegate.java
===================================================================
--- trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/valgrind/ValgrindPythonConfigurationDelegate.java	2008-02-14 19:38:59 UTC (rev 407)
+++ trunk/org.indt.esbox.python.launch/src/org/indt/esbox/python/launch/valgrind/ValgrindPythonConfigurationDelegate.java	2008-02-15 00:14:59 UTC (rev 408)
@@ -80,7 +80,7 @@
 		
 		boolean isRunStandalone = configuration.getAttribute(ESboxPythonLaunchConstants.ATTR_RUN_STANDALONE, ESboxPythonLaunchConstants.RUN_STANDALONE_DEFAULT);		
 			
-		String args[] = new String[] { "-q --tool=memcheck --leak-check=yes", isRunStandalone ? "run-standalone.sh " : "" , exePath.toOSString() };
+		String args[] = new String[] { "-q --tool=memcheck --leak-check=yes", isRunStandalone ? "run-standalone.sh " : "" , "python2.5" , exePath.toOSString() };
 		
 		List<String> cmdArray = valgrindInfo.getCommandLine();
 		for (int i = 0; i < args.length; i++) {

Modified: trunk/org.indt.esbox.ui/src/org/indt/esbox/ui/views/OProfileView.java
===================================================================
--- trunk/org.indt.esbox.ui/src/org/indt/esbox/ui/views/OProfileView.java	2008-02-14 19:38:59 UTC (rev 407)
+++ trunk/org.indt.esbox.ui/src/org/indt/esbox/ui/views/OProfileView.java	2008-02-15 00:14:59 UTC (rev 408)
@@ -297,7 +297,7 @@
 
 	public void toolExecuted(ToolEvent event) {
 		final Process process = (Process)event.getSource();
-		UIActivator.getDefault().getWorkbench().getDisplay().syncExec(new Runnable() {
+		UIActivator.getDefault().getWorkbench().getDisplay().asyncExec(new Runnable() {
 			public void run() {
 				try {
 					fillTable(process.getInputStream());



More information about the Esbox-commits mailing list