Attachment 164277 Details for Bug 293704 – add build arguments3

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] add build arguments3

293704_buildargs_lost-patch3.txt (text/plain), 5.07 KB, created by Axel Mueller

on 2010-04-08 15:51:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Axel Mueller

Created: 2010-04-08 15:51:01 EDT

Size: 5.07 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.make.core
>Index: src/org/eclipse/cdt/make/internal/core/MakeTarget.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java,v
>retrieving revision 1.36
>diff -u -r1.36 MakeTarget.java
>--- src/org/eclipse/cdt/make/internal/core/MakeTarget.java	10 Feb 2010 03:55:42 -0000	1.36
>+++ src/org/eclipse/cdt/make/internal/core/MakeTarget.java	8 Apr 2010 19:46:40 -0000
>@@ -127,6 +127,14 @@
> 	}
> 
> 	public String getBuildArguments() {
>+		if (isDefaultBuildCmd()) {
>+			IMakeBuilderInfo info;
>+			try {
>+				info = MakeCorePlugin.createBuildInfo(getProject(), manager.getBuilderID(targetBuilderID));
>+				return info.getBuildArguments();
>+			} catch (CoreException e) {
>+			}
>+		}		
> 		String result = getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, ""); //$NON-NLS-1$
> 		try {
> 			result = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(result, false);
>#P org.eclipse.cdt.make.ui
>Index: src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java,v
>retrieving revision 1.6
>diff -u -r1.6 MakeTargetDndUtil.java
>--- src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java	4 Jan 2010 03:51:54 -0000	1.6
>+++ src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java	8 Apr 2010 19:46:46 -0000
>@@ -411,10 +411,12 @@
> 		// IMakeCommonBuildInfo attributes
> 		// Ignore IMakeCommonBuildInfo.BUILD_LOCATION in order not to pick
> 		// location of another project (or another folder)
>-		destination.setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND,
>-			source.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, DEFAULT_BUILD_COMMAND));
>-		destination.setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS,
>-			source.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, "")); //$NON-NLS-1$
>+		if (!source.isDefaultBuildCmd()){
>+			destination.setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND,
>+					source.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, DEFAULT_BUILD_COMMAND));
>+			destination.setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS,
>+					source.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, "")); //$NON-NLS-1$
>+		}
> 		destination.setStopOnError(source.isStopOnError());
> 		destination.setUseDefaultBuildCmd(source.isDefaultBuildCmd());
> 		destination.setEnvironment(source.getEnvironment());
>Index: src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java,v
>retrieving revision 1.29
>diff -u -r1.29 MakeTargetDialog.java
>--- src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java	8 Feb 2010 04:20:14 -0000	1.29
>+++ src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java	8 Apr 2010 19:46:47 -0000
>@@ -78,6 +78,7 @@
> 
> 	private IPath buildCommand;
> 	private final String defaultBuildCommand;
>+	private final String defaultBuildArguments;
> 	private boolean isDefaultCommand;
> 	private boolean isStopOnError;
> 	private boolean runAllBuilders = true;
>@@ -169,6 +170,7 @@
> 		buildCommand = buildInfo.getBuildCommand();
> 		defaultBuildCommand = buildCommand.toString();
> 		buildArguments = buildInfo.getBuildArguments();
>+		defaultBuildArguments = buildArguments;
> 		targetString = buildInfo.getIncrementalBuildTarget();
> 
> 		setShellStyle(getShellStyle() | SWT.RESIZE);
>@@ -279,7 +281,13 @@
> 			@Override
> 			public void widgetSelected(SelectionEvent e) {
> 				if (defButton.getSelection() == true) {
>-					commandText.setText(defaultBuildCommand);
>+					StringBuffer cmd = new StringBuffer(defaultBuildCommand);
>+					String args = defaultBuildArguments;
>+					if (args != null && !args.equals("")) { //$NON-NLS-1$
>+						cmd.append(" "); //$NON-NLS-1$
>+						cmd.append(args);
>+					}
>+					commandText.setText(cmd.toString());
> 					commandText.setEnabled(false);
> 					stopOnErrorButton.setEnabled(true);
> 				} else {
>@@ -384,12 +392,10 @@
> 		targetNameText.selectAll();
> 		if (buildCommand != null) {
> 			StringBuffer cmd = new StringBuffer(buildCommand.toOSString());
>-			if (!isDefaultCommand) {
>-				String args = buildArguments;
>-				if (args != null && !args.equals("")) { //$NON-NLS-1$
>-					cmd.append(" "); //$NON-NLS-1$
>-					cmd.append(args);
>-				}
>+			String args = buildArguments;
>+			if (args != null && !args.equals("")) { //$NON-NLS-1$
>+				cmd.append(" "); //$NON-NLS-1$
>+				cmd.append(args);
> 			}
> 			commandText.setText(cmd.toString());
> 		}
>@@ -504,6 +510,7 @@
> 			target.setUseDefaultBuildCmd(useDefaultBuildCmd());
> 			if (useDefaultBuildCmd()) {
> 				target.setBuildAttribute(IMakeTarget.BUILD_COMMAND, defaultBuildCommand);
>+				target.setBuildAttribute(IMakeTarget.BUILD_ARGUMENTS, defaultBuildArguments);
> 			} else {
> 				String bldLine = getBuildLine();
> 				int start = 0;

Flags:

angvoz.dev: iplog+

Actions: View | Diff

Attachments on bug 293704: 163332 | 163784 | 164277