Attachment #134242 for bug #274834

View | Details | Raw Unified | Return to bug 274834
Collapse All | Expand All

Lines 123-128 Link Here

(-)src/org/eclipse/pde/internal/build/IBuildPropertiesConstants.java (+2 lines)
123	public static final String PROPERTY_COMPILE_PROBLEM_MARKER_EXISTS = "compilation.problem.marker.exists"; //$NON-NLS-1$	123	public static final String PROPERTY_COMPILE_PROBLEM_MARKER_EXISTS = "compilation.problem.marker.exists"; //$NON-NLS-1$
124	public static final String PROPERTY_COMPILATION_ERROR = "compilation.error.occured"; //$NON-NLS-1$	124	public static final String PROPERTY_COMPILATION_ERROR = "compilation.error.occured"; //$NON-NLS-1$
125		125
		126	public static final String PROPERTY_SUPPRESS_RESOLUTION_ERRORS = "suppressResolutionErrors"; //$NON-NLS-1$
		127
126	public static final String SOURCE_PLUGIN = "sourcePlugin"; //$NON-NLS-1$	128	public static final String SOURCE_PLUGIN = "sourcePlugin"; //$NON-NLS-1$
127		129
128	public static final String PROPERTY_PACKAGER_MODE = "packagerMode"; //$NON-NLS-1$	130	public static final String PROPERTY_PACKAGER_MODE = "packagerMode"; //$NON-NLS-1$

Lines 92-98 Link Here

(-)src_ant/org/eclipse/pde/internal/build/tasks/BuildScriptGeneratorTask.java (-1 / +7 lines)
92	public void run() throws CoreException {	92	public void run() throws CoreException {
93	initializeAntProperties(antProperties);	93	initializeAntProperties(antProperties);
94	setEEProfileProperties(antProperties);	94	setEEProfileProperties(antProperties);
95	generator.setReportResolutionErrors(true);	95
		96	if (!Boolean.valueOf(antProperties.getProperty(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS)).booleanValue())
		97	generator.setReportResolutionErrors(true);
96	generator.setImmutableAntProperties(antProperties);	98	generator.setImmutableAntProperties(antProperties);
97	BundleHelper.getDefault().setLog(this);	99	BundleHelper.getDefault().setLog(this);
98	generator.generate();	100	generator.generate();
Lines 115-120 Link Here
115	value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_GATHERING);	117	value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_P2_GATHERING);
116	if (Boolean.valueOf(value).booleanValue())	118	if (Boolean.valueOf(value).booleanValue())
117	properties.put(IBuildPropertiesConstants.PROPERTY_P2_GATHERING, "true"); //$NON-NLS-1$	119	properties.put(IBuildPropertiesConstants.PROPERTY_P2_GATHERING, "true"); //$NON-NLS-1$
		120
		121	value = getProject().getProperty(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS);
		122	if (Boolean.valueOf(value).booleanValue())
		123	properties.put(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS, "true"); //$NON-NLS-1$
118	}	124	}
119		125
120	private void setEEProfileProperties(Properties antProperties) {	126	private void setEEProfileProperties(Properties antProperties) {





import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.*;
import org.eclipse.pde.internal.build.IBuildPropertiesConstants;

public class BuildConfiguration {
	public static final String TRUE = "true";

		Properties builderProperties = getBuildConfig();
		builderProperties.put("buildDirectory", builder);
		builderProperties.put("builder", builder);
		builderProperties.put(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS, TRUE);
		return builderProperties;
	}


		properties.put("type", type);
		properties.put("id", id);
		properties.put("buildDirectory", buildFolder.getLocation().toOSString());
		properties.put(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS, TRUE);
		return properties;
	}
}

Return to bug 274834

Lines 7-12 Link Here

(-)src/org/eclipse/pde/build/tests/BuildConfiguration.java (+3 lines)
7		7
8	import org.eclipse.core.resources.IFolder;	8	import org.eclipse.core.resources.IFolder;
9	import org.eclipse.core.runtime.*;	9	import org.eclipse.core.runtime.*;
		10	import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
10		11
11	public class BuildConfiguration {	12	public class BuildConfiguration {
12	public static final String TRUE = "true";	13	public static final String TRUE = "true";
Lines 72-77 Link Here
72	Properties builderProperties = getBuildConfig();	73	Properties builderProperties = getBuildConfig();
73	builderProperties.put("buildDirectory", builder);	74	builderProperties.put("buildDirectory", builder);
74	builderProperties.put("builder", builder);	75	builderProperties.put("builder", builder);
		76	builderProperties.put(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS, TRUE);
75	return builderProperties;	77	return builderProperties;
76	}	78	}
77		79
Lines 88-93 Link Here
88	properties.put("type", type);	90	properties.put("type", type);
89	properties.put("id", id);	91	properties.put("id", id);
90	properties.put("buildDirectory", buildFolder.getLocation().toOSString());	92	properties.put("buildDirectory", buildFolder.getLocation().toOSString());
		93	properties.put(IBuildPropertiesConstants.PROPERTY_SUPPRESS_RESOLUTION_ERRORS, TRUE);
91	return properties;	94	return properties;
92	}	95	}
93	}	96	}