Attachment 166361 Details for Bug 310674 – patch

[patch] patch

310674.txt (text/plain), 2.03 KB, created by Andrew Niefer

on 2010-04-28 14:19:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2010-04-28 14:19:15 EDT

Size: 2.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.build
>Index: src/org/eclipse/pde/internal/build/builder/BuildDirector.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/BuildDirector.java,v
>retrieving revision 1.18
>diff -u -r1.18 BuildDirector.java
>--- src/org/eclipse/pde/internal/build/builder/BuildDirector.java	5 Mar 2010 20:36:25 -0000	1.18
>+++ src/org/eclipse/pde/internal/build/builder/BuildDirector.java	28 Apr 2010 18:19:03 -0000
>@@ -555,21 +555,24 @@
> 	}
> 
> 	protected void collectElementToAssemble(BuildTimeFeature featureToCollect) throws CoreException {
>-		if (assemblyData == null)
>+		if (assemblyData == null || featureToCollect == null)
> 			return;
> 
>-		/* collect binary features */
>-		if (featureToCollect != null && featureToCollect.isBinary()) {
>+		String binIncludes = getBuildProperties(featureToCollect).getProperty(PROPERTY_BIN_INCLUDES);
>+
>+		/* collect binary features, and any feature defining bin.includes */
>+		if (featureToCollect.isBinary() || (binIncludes != null && binIncludes.length() > 0)) {
> 			basicCollectElementToAssemble(featureToCollect);
> 			return;
> 		}
> 
>-		// don't collect the generated containers
>-		if (featureToCollect.getId().equals(CONTAINER_FEATURE) || featureToCollect.getId().equals(UI_CONTAINER_FEATURE))
>+		//at this point, we have a non-binary feature with empty bin includes
>+		//when building p2, containers (features without bin.includes) need to be collected, 
>+		//with the exception of the pde generated containers.
>+		if (!BuildDirector.p2Gathering)
> 			return;
> 
>-		// don't collect if bin.includes is empty, except if we are publishing p2 metadata
>-		if (!BuildDirector.p2Gathering && getBuildProperties(featureToCollect).get(PROPERTY_BIN_INCLUDES) == null)
>+		if (featureToCollect.getId().equals(CONTAINER_FEATURE) || featureToCollect.getId().equals(UI_CONTAINER_FEATURE))
> 			return;
> 
> 		basicCollectElementToAssemble(featureToCollect);

Actions: View | Diff

Attachments on bug 310674: 166361