Added dsymutil option, needed for Mac OS X.

5 files changed, 46 insertions, 1 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
index 3e96029955..6e5d74c1bd 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-06  Elliott Baron  <ebaron@fedoraproject.org>
+
+	Bug #333640
+	* src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java: Added 3.5, 3.6 version strings.
+	* src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
+	(getValgrindArgumentsArray): Added dsymutil option. 
+	* src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties: Likewise. 
+	* src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java (createErrorOptions): Likewise.
+	(initializeFrom): Likewise.
+	(performApply): Likewise.
+	(setDefaults): Likewise.
+
 2010-08-03  Elliott Baron  <ebaron@fedoraproject.org>
 
 	* src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java (launch): API changes. 
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
index 074b812b90..ac99e5a74e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
@@ -149,7 +149,7 @@ public class ValgrindLaunchConfigurationDelegate extends AbstractCLaunchDelegate
 			// call Valgrind
 			command.execute(commandArray, getEnvironment(config), workDir, valgrindLocation.toOSString(), usePty);
 			monitor.worked(3);
-			process = createNewProcess(launch, command.getProcess() ,commandArray[0]);
+			process = createNewProcess(launch, command.getProcess(), commandArray[0]);
 			// set the command line used
 			process.setAttribute(IProcess.ATTR_CMDLINE, command.getCommandLine());
 			while (!process.isTerminated()) {
@@ -335,6 +335,11 @@ public class ValgrindLaunchConfigurationDelegate extends AbstractCLaunchDelegate
 			}
 		}
 		
+		// 3.6.0 specific
+		if (valgrindVersion == null || valgrindVersion.compareTo(ValgrindLaunchPlugin.VER_3_6_0) >= 0) {
+			opts.add(CommandLineConstants.OPT_DSYMUTIL + EQUALS + (config.getAttribute(LaunchConfigurationConstants.ATTR_GENERAL_DSYMUTIL, LaunchConfigurationConstants.DEFAULT_GENERAL_DSYMUTIL) ? YES : NO));
+		}
+		
 		List<?> suppFiles = config.getAttribute(LaunchConfigurationConstants.ATTR_GENERAL_SUPPFILES, LaunchConfigurationConstants.DEFAULT_GENERAL_SUPPFILES); 
 		for (Object strpath : suppFiles) {
 			IPath suppfile = getPlugin().parseWSPath((String) strpath);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
index 4a664eda17..dc24f81ad8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
@@ -63,6 +63,9 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin implements IPropertyC
 	public static final Version VER_3_3_1 = new Version(3, 3, 1);
 	public static final Version VER_3_4_0 = new Version(3, 4, 0);
 	public static final Version VER_3_4_1 = new Version(3, 4, 1);
+	public static final Version VER_3_5_0 = new Version(3, 5, 0);
+	public static final Version VER_3_6_0 = new Version(3, 6, 0);
+	
 	private static final Version MIN_VER = VER_3_3_0;
 	private static final String VERSION_PREFIX = "valgrind-"; //$NON-NLS-1$
 	private static final char VERSION_DELIMITER = '-';
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
index 200c4a90b2..7f3bbb6c5b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
@@ -69,6 +69,7 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 	protected Spinner maxStackFrameSpinner;
 	protected Button mainStackSizeButton;
 	protected Spinner mainStackSizeSpinner;
+	protected Button dSymUtilButton;
 	protected List suppFileList;
 
 	protected String tool;
@@ -321,6 +322,13 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 			mainStackSizeSpinner.addModifyListener(modifyListener);
 			mainStackSizeSpinner.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		}
+		
+		if (valgrindVersion == null || valgrindVersion.compareTo(ValgrindLaunchPlugin.VER_3_6_0) >= 0) {
+			dSymUtilButton = new Button(errorTop, SWT.CHECK);
+			dSymUtilButton.setText(Messages.getString("ValgrindOptionsTab.dsymutil")); //$NON-NLS-1$
+			dSymUtilButton.addSelectionListener(selectListener);
+			dSymUtilButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		}
 	}
 
 	protected void createSuppressionsOption(Composite top) {
@@ -490,6 +498,11 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 				mainStackSizeSpinner.setSelection(configuration.getAttribute(LaunchConfigurationConstants.ATTR_GENERAL_MAINSTACK, LaunchConfigurationConstants.DEFAULT_GENERAL_MAINSTACK));
 				checkMainStackEnablement();
 			}
+			
+			// 3.6.0 specific
+			if (valgrindVersion == null || valgrindVersion.compareTo(ValgrindLaunchPlugin.VER_3_6_0) >= 0) {
+				dSymUtilButton.setSelection(configuration.getAttribute(LaunchConfigurationConstants.ATTR_GENERAL_DSYMUTIL, LaunchConfigurationConstants.DEFAULT_GENERAL_DSYMUTIL));
+			}
 		} catch (CoreException e) {
 			ex = e;
 		}
@@ -549,6 +562,12 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 			configuration.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_MAINSTACK_BOOL, mainStackSizeButton.getSelection());
 			configuration.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_MAINSTACK, mainStackSizeSpinner.getSelection());
 		}
+		
+		// 3.6.0 specific
+		if (valgrindVersion == null || valgrindVersion.compareTo(ValgrindLaunchPlugin.VER_3_6_0) >= 0) {
+			configuration.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_DSYMUTIL, dSymUtilButton.getSelection());
+		}
+		
 		if (dynamicTab != null) {
 			dynamicTab.performApply(configuration);
 		}
@@ -574,6 +593,11 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 			configuration.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_MAINSTACK, LaunchConfigurationConstants.DEFAULT_GENERAL_MAINSTACK);
 		}
 		
+		// 3.6.0 specific
+		if (valgrindVersion == null || valgrindVersion.compareTo(ValgrindLaunchPlugin.VER_3_6_0) >= 0) {
+			configuration.setAttribute(LaunchConfigurationConstants.ATTR_GENERAL_DSYMUTIL, LaunchConfigurationConstants.DEFAULT_GENERAL_DSYMUTIL);
+		}
+		
 		if (dynamicTab != null) {
 			dynamicTab.setDefaults(configuration);
 			initDefaults = false;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties
index 8cddd6ed28..703bd20abe 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/messages.properties
@@ -36,6 +36,7 @@ ValgrindOptionsTab.General=General Options
 ValgrindOptionsTab.limit_errors=Limit errors reported
 ValgrindOptionsTab.Main_stack_size=Set main thread's stack size (B):
 ValgrindOptionsTab.max_size_of_stack_frame=Max stack frame size (B):
+ValgrindOptionsTab.dsymutil=Run dsymutil (Mac OS X)
 ValgrindOptionsTab.No_options_tab_found=No options tab found for tool 
 ValgrindOptionsTab.num_callers=Callers in stack trace:
 ValgrindOptionsTab.run_freeres=Run __libc_freeres on exit