Skip to content

Commit

Permalink
[PDE-Build] Copy Eclipse-BundleShape and other headers in wrapped states
Browse files Browse the repository at this point in the history
For wrapped OSGi States obtained from pde.core/ui the Manifest
'Eclipse-BundleShape' entries, besides others, were not copied into the
bundle's user-object Properties. This had the consequence that in
ShapeAdvisor.getUnpackClause() the value of that entry could never be
considered.
The method only used to return the expected boolean value because of
corresponding unpack-attributes in 'plugin' entries of feature.xml
files. But since the removal of that otherwise unused attribute in [1]
this makeshift was gone and ShapeAdvisor.getUnpackClause() always return
false leading to all bundles in an exported product being in jar-shape,
even if the 'Eclipse-BundleShape' entry in the MANIFEST.MF told
something different.

Fixes eclipse-pde#995

[1] - eclipse-pde#770
  • Loading branch information
HannesWell authored and fedejeanne committed Jul 31, 2024
1 parent ec73ea2 commit bb499b6
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ public PDEState(PDEUIStateWrapper initialState) {
addedBundle = new ArrayList<>();
unqualifiedBundles = new ArrayList<>();
//forceQualifiers();
for (BundleDescription bundle : state.getBundles()) {
Dictionary<String, String> manifest = loadManifest(new File(bundle.getLocation()));
rememberManifestEntries(bundle, manifest, MANIFEST_ENTRIES);
}
}

public PDEState() {
Expand Down

0 comments on commit bb499b6

Please sign in to comment.