Attachment 123304 Details for Bug 260582 – Using the transformer into the build

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

[patch] Using the transformer into the build

directorpatch4Paths.txt (text/plain), 2.13 KB, created by Pascal Rapicault

on 2009-01-21 17:32:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2009-01-21 17:32:42 EST

Size: 2.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.director
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF,v
>retrieving revision 1.20
>diff -u -r1.20 MANIFEST.MF
>--- META-INF/MANIFEST.MF	14 Jul 2008 20:04:10 -0000	1.20
>+++ META-INF/MANIFEST.MF	11 Sep 2008 18:33:46 -0000
>@@ -4,7 +4,7 @@
> Bundle-Name: %pluginName
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
>-Bundle-Version: 1.0.100.qualifier
>+Bundle-Version: 1.0.0.qualifier
> Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
>  org.eclipse.equinox.internal.provisional.p2.core,
>  org.eclipse.equinox.internal.provisional.p2.core.eventbus,
>Index: src/org/eclipse/equinox/internal/p2/director/Projector.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java,v
>retrieving revision 1.12
>diff -u -r1.12 Projector.java
>--- src/org/eclipse/equinox/internal/p2/director/Projector.java	16 Jul 2008 19:17:12 -0000	1.12
>+++ src/org/eclipse/equinox/internal/p2/director/Projector.java	11 Sep 2008 18:33:46 -0000
>@@ -342,10 +342,16 @@
> 					if (isApplicable(reqs[i][1])) {
> 						genericExpandRequirement(" -1 " + getVariable(patch) + " -1 " + getVariable(iu), iu, reqs[i][1], " >= -1", " 1 " + getVariable(patch) + "=0;"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
> 					}
>+
>+					//P1 -> B
>+					if (reqs[i][0] == null)
>+						expandRequirement(getVariable(patch), patch, reqs[i][1]);
>+
> 					//Generate dependency when the patch is not applied
> 					//-P1 -> A -> B ( equiv. -P1 & A -> B equiv 1 P1 - 1 A + 1 B >= 0)
>-					if (isApplicable(reqs[i][0]))
>+					if (reqs[i][0] != null && isApplicable(reqs[i][0]))
> 						genericExpandRequirement(" 1 " + getVariable(patch) + " -1 " + getVariable(iu), iu, reqs[i][0], " >= 0", implies(getVariable(iu), getVariable(patch))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+
> 				}
> 				addOptionalityExpression();
> 			}

Actions: View | Diff

Attachments on bug 260582: 123304 | 123553