Attachment #164277 for bug #293704

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

Lines 127-132 Link Here

(-)src/org/eclipse/cdt/make/internal/core/MakeTarget.java (+8 lines)
127	}	127	}
128		128
129	public String getBuildArguments() {	129	public String getBuildArguments() {
		130	if (isDefaultBuildCmd()) {
		131	IMakeBuilderInfo info;
		132	try {
		133	info = MakeCorePlugin.createBuildInfo(getProject(), manager.getBuilderID(targetBuilderID));
		134	return info.getBuildArguments();
		135	} catch (CoreException e) {
		136	}
		137	}
130	String result = getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, ""); //$NON-NLS-1$	138	String result = getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, ""); //$NON-NLS-1$
131	try {	139	try {
132	result = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(result, false);	140	result = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(result, false);

Lines 411-420 Link Here

(-)src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java (-4 / +6 lines)
411	// IMakeCommonBuildInfo attributes	411	// IMakeCommonBuildInfo attributes
412	// Ignore IMakeCommonBuildInfo.BUILD_LOCATION in order not to pick	412	// Ignore IMakeCommonBuildInfo.BUILD_LOCATION in order not to pick
413	// location of another project (or another folder)	413	// location of another project (or another folder)
414	destination.setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND,	414	if (!source.isDefaultBuildCmd()){
415	source.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, DEFAULT_BUILD_COMMAND));	415	destination.setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND,
416	destination.setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS,	416	source.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, DEFAULT_BUILD_COMMAND));
417	source.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, "")); //$NON-NLS-1$	417	destination.setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS,
		418	source.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, "")); //$NON-NLS-1$
		419	}
418	destination.setStopOnError(source.isStopOnError());	420	destination.setStopOnError(source.isStopOnError());
419	destination.setUseDefaultBuildCmd(source.isDefaultBuildCmd());	421	destination.setUseDefaultBuildCmd(source.isDefaultBuildCmd());
420	destination.setEnvironment(source.getEnvironment());	422	destination.setEnvironment(source.getEnvironment());

Lines 78-83 Link Here

(-)src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java (-7 / +14 lines)
78		78
79	private IPath buildCommand;	79	private IPath buildCommand;
80	private final String defaultBuildCommand;	80	private final String defaultBuildCommand;
		81	private final String defaultBuildArguments;
81	private boolean isDefaultCommand;	82	private boolean isDefaultCommand;
82	private boolean isStopOnError;	83	private boolean isStopOnError;
83	private boolean runAllBuilders = true;	84	private boolean runAllBuilders = true;
Lines 169-174 Link Here
169	buildCommand = buildInfo.getBuildCommand();	170	buildCommand = buildInfo.getBuildCommand();
170	defaultBuildCommand = buildCommand.toString();	171	defaultBuildCommand = buildCommand.toString();
171	buildArguments = buildInfo.getBuildArguments();	172	buildArguments = buildInfo.getBuildArguments();
		173	defaultBuildArguments = buildArguments;
172	targetString = buildInfo.getIncrementalBuildTarget();	174	targetString = buildInfo.getIncrementalBuildTarget();
173		175
174	setShellStyle(getShellStyle() \| SWT.RESIZE);	176	setShellStyle(getShellStyle() \| SWT.RESIZE);
Lines 279-285 Link Here
279	@Override	281	@Override
280	public void widgetSelected(SelectionEvent e) {	282	public void widgetSelected(SelectionEvent e) {
281	if (defButton.getSelection() == true) {	283	if (defButton.getSelection() == true) {
282	commandText.setText(defaultBuildCommand);	284	StringBuffer cmd = new StringBuffer(defaultBuildCommand);
		285	String args = defaultBuildArguments;
		286	if (args != null && !args.equals("")) { //$NON-NLS-1$
		287	cmd.append(" "); //$NON-NLS-1$
		288	cmd.append(args);
		289	}
		290	commandText.setText(cmd.toString());
283	commandText.setEnabled(false);	291	commandText.setEnabled(false);
284	stopOnErrorButton.setEnabled(true);	292	stopOnErrorButton.setEnabled(true);
285	} else {	293	} else {
Lines 384-395 Link Here
384	targetNameText.selectAll();	392	targetNameText.selectAll();
385	if (buildCommand != null) {	393	if (buildCommand != null) {
386	StringBuffer cmd = new StringBuffer(buildCommand.toOSString());	394	StringBuffer cmd = new StringBuffer(buildCommand.toOSString());
387	if (!isDefaultCommand) {	395	String args = buildArguments;
388	String args = buildArguments;	396	if (args != null && !args.equals("")) { //$NON-NLS-1$
389	if (args != null && !args.equals("")) { //$NON-NLS-1$	397	cmd.append(" "); //$NON-NLS-1$
390	cmd.append(" "); //$NON-NLS-1$	398	cmd.append(args);
391	cmd.append(args);
392	}
393	}	399	}
394	commandText.setText(cmd.toString());	400	commandText.setText(cmd.toString());
395	}	401	}
Lines 504-509 Link Here
504	target.setUseDefaultBuildCmd(useDefaultBuildCmd());	510	target.setUseDefaultBuildCmd(useDefaultBuildCmd());
505	if (useDefaultBuildCmd()) {	511	if (useDefaultBuildCmd()) {
506	target.setBuildAttribute(IMakeTarget.BUILD_COMMAND, defaultBuildCommand);	512	target.setBuildAttribute(IMakeTarget.BUILD_COMMAND, defaultBuildCommand);
		513	target.setBuildAttribute(IMakeTarget.BUILD_ARGUMENTS, defaultBuildArguments);
507	} else {	514	} else {
508	String bldLine = getBuildLine();	515	String bldLine = getBuildLine();
509	int start = 0;	516	int start = 0;

Return to bug 293704