Skip to content

Commit

Permalink
[Releng] Don't check tp isResolved which is always false on startup
Browse files Browse the repository at this point in the history
  • Loading branch information
merks committed Nov 7, 2021
1 parent 989f172 commit 9ac25ae
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion plugins/org.eclipse.oomph.setup.doc/META-INF/MANIFEST.MF
Expand Up @@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=opti
org.eclipse.oomph.setup.mylyn.edit;bundle-version="[1.11.0,2.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.oomph.setup.p2;bundle-version="[1.17.0,2.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.oomph.setup.p2.edit;bundle-version="[1.13.0,2.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.oomph.setup.pde;bundle-version="[1.12.0,2.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.oomph.setup.pde;bundle-version="[1.13.0,2.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.oomph.setup.pde.edit;bundle-version="[1.12.0,2.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.oomph.setup.projects;bundle-version="[1.14.0,2.0.0)";resolution:=optional;visibility:=reexport,
org.eclipse.oomph.setup.projects.edit;bundle-version="[1.12.0,2.0.0)";resolution:=optional;visibility:=reexport,
Expand Down
12 changes: 6 additions & 6 deletions plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF
Expand Up @@ -2,20 +2,20 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.oomph.setup.pde;singleton:=true
Bundle-Version: 1.12.0.qualifier
Bundle-Version: 1.13.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.oomph.setup.internal.pde.PDEPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.oomph.setup.internal.pde;version="1.12.0";x-internal:=true,
org.eclipse.oomph.setup.pde;version="1.12.0";x-internal:=true,
org.eclipse.oomph.setup.pde.impl;version="1.12.0";x-internal:=true,
org.eclipse.oomph.setup.pde.util;version="1.12.0";x-internal:=true
Export-Package: org.eclipse.oomph.setup.internal.pde;version="1.13.0";x-internal:=true,
org.eclipse.oomph.setup.pde;version="1.13.0";x-internal:=true,
org.eclipse.oomph.setup.pde.impl;version="1.13.0";x-internal:=true,
org.eclipse.oomph.setup.pde.util;version="1.13.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
org.eclipse.oomph.setup;bundle-version="[1.18.0,2.0.0)";visibility:=reexport,
org.eclipse.oomph.setup;bundle-version="[1.22.0,2.0.0)";visibility:=reexport,
org.eclipse.oomph.util.pde;bundle-version="[1.11.0,2.0.0)",
org.eclipse.pde.api.tools;bundle-version="[1.0.0,2.0.0)",
org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)"
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.oomph.setup.pde/pom.xml
Expand Up @@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.oomph</groupId>
<artifactId>org.eclipse.oomph.setup.pde</artifactId>
<version>1.12.0-SNAPSHOT</version>
<version>1.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<build>
Expand Down
Expand Up @@ -268,8 +268,7 @@ public boolean isNeeded(SetupTaskContext context) throws Exception
targetDefinition = TargetPlatformUtil.getTargetDefinition(name);

ITargetDefinition activeTargetDefinition = TargetPlatformUtil.getActiveTargetDefinition();
if (targetDefinition == null || !targetDefinition.isResolved() || !isActivate() || activeTargetDefinition == null
|| !targetDefinition.getHandle().equals(activeTargetDefinition.getHandle()))
if (targetDefinition == null || !isActivate() || activeTargetDefinition == null || !targetDefinition.getHandle().equals(activeTargetDefinition.getHandle()))
{
SetupUtil.getResolvingTargetDefinitions(context).add(name);

Expand Down

0 comments on commit 9ac25ae

Please sign in to comment.