Attachment 66930 Details for Bug 186204 – new new patch

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

[patch] new new patch

186204.patch (text/plain), 4.86 KB, created by Pascal Rapicault

on 2007-05-11 15:39:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2007-05-11 15:39:26 EDT

Size: 4.86 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java,v
>retrieving revision 1.100
>diff -u -r1.100 ModelBuildScriptGenerator.java
>--- src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java	10 May 2007 02:11:10 -0000	1.100
>+++ src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java	11 May 2007 19:39:08 -0000
>@@ -789,8 +789,8 @@
> 	 * @param modelId
> 	 * @throws CoreException
> 	 */
>-	public void setModelId(String modelId) throws CoreException {
>-		BundleDescription newModel = getModel(modelId);
>+	public void setModelId(String modelId, String modelVersion) throws CoreException {
>+		BundleDescription newModel = getModel(modelId, modelVersion);
> 		if (newModel == null) {
> 			String message = NLS.bind(Messages.exception_missingElement, modelId);
> 			throw new CoreException(new Status(IStatus.ERROR, PI_PDEBUILD, EXCEPTION_ELEMENT_MISSING, message, null));
>@@ -1295,8 +1295,10 @@
> 	 * @param modelId the identifier of the model object to lookup
> 	 * @return the model object or <code>null</code>
> 	 */
>-	protected BundleDescription getModel(String modelId) throws CoreException {
>-		return getSite(false).getRegistry().getResolvedBundle(modelId);
>+	protected BundleDescription getModel(String modelId, String modelVersion) throws CoreException {
>+		if (modelVersion == null)
>+			return getSite(false).getRegistry().getResolvedBundle(modelId);
>+		return getSite(false).getRegistry().getResolvedBundle(modelId, modelVersion);
> 	}
> 
> 	public IPluginEntry getAssociatedEntry() {
>Index: src/org/eclipse/pde/internal/build/BuildScriptGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BuildScriptGenerator.java,v
>retrieving revision 1.66
>diff -u -r1.66 BuildScriptGenerator.java
>--- src/org/eclipse/pde/internal/build/BuildScriptGenerator.java	30 Apr 2007 20:51:53 -0000	1.66
>+++ src/org/eclipse/pde/internal/build/BuildScriptGenerator.java	11 May 2007 19:39:08 -0000
>@@ -72,6 +72,7 @@
> 	private boolean generateVersionsList = false;
> 
> 	private Properties antProperties = null;
>+	private BundleDescription[] bundlesToBuild;
> 	
> 	private static final String PROPERTY_ARCHIVESFORMAT = "archivesFormat"; //$NON-NLS-1$
> 
>@@ -112,6 +113,8 @@
> 	 * Separate elements by kind.
> 	 */
> 	protected void sortElements(List features, List plugins) {
>+		if (elements == null)
>+			return;
> 		for (int i = 0; i < elements.length; i++) {
> 			int index = elements[i].indexOf('@');
> 			String type = elements[i].substring(0, index);
>@@ -135,12 +138,11 @@
> 				generator = new ModelBuildScriptGenerator();
> 				generator.setReportResolutionErrors(reportResolutionErrors);
> 				generator.setIgnoreMissingPropertiesFile(ignoreMissingPropertiesFile);
>-				//Filtering is not required here, since we are only generating the
>-				// build for a plugin or a fragment
>-				String model = (String) iterator.next();
>+				//Filtering is not required here, since we are only generating the build for a plugin or a fragment
>+				String[] modelInfo = getNameAndVersion((String) iterator.next());
> 				generator.setBuildSiteFactory(siteFactory);
>-				generator.setModelId(model);
>-
>+				generator.setModelId(modelInfo[0], modelInfo[1]);
>+				
> 				generator.setPluginPath(pluginPath);
> 				generator.setDevEntries(devEntries);
> 				generator.setCompiledElements(generator.getCompiledElements());
>@@ -148,6 +150,22 @@
> 				generator.setSignJars(signJars);
> 				generator.generate();
> 			}
>+			if (bundlesToBuild != null)
>+				for (int i = 0; i < bundlesToBuild.length; i++) {
>+					generator = new ModelBuildScriptGenerator();
>+					generator.setReportResolutionErrors(reportResolutionErrors);
>+					generator.setIgnoreMissingPropertiesFile(ignoreMissingPropertiesFile);
>+					//Filtering is not required here, since we are only generating the build for a plugin or a fragment
>+					generator.setBuildSiteFactory(siteFactory);
>+					generator.setModel(bundlesToBuild[i]);
>+					
>+					generator.setPluginPath(pluginPath);
>+					generator.setDevEntries(devEntries);
>+					generator.setCompiledElements(generator.getCompiledElements());
>+					generator.setBuildingOSGi(isBuildingOSGi());
>+					generator.setSignJars(signJars);
>+					generator.generate();
>+				}
> 		} finally {
> 			if (generator != null)
> 				generator.getSite(false).getRegistry().cleanupOriginalState();
>@@ -506,4 +524,8 @@
> 	public void setImmutableAntProperties(Properties properties) {
> 		antProperties = properties;
> 	}
>+	
>+	public void setBundles(BundleDescription[] bundles) {
>+		bundlesToBuild = bundles;
>+	}
> }

Actions: View | Diff

Attachments on bug 186204: 66803 | 66859 | 66860 | 66861 | 66930