Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PDE-Build] Copy Eclipse-BundleShape and other headers in wrapped states #1271

Merged
merged 1 commit into from
May 15, 2024
+4 −0
Merged

[PDE-Build] Copy Eclipse-BundleShape and other headers in wrapped states #1271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@
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 Expand Up @@ -436,14 +440,14 @@
if (AbstractScriptGenerator.getImmutableAntProperty(profileName) != null || (j == 0 && !added)) {
IExecutionEnvironment env = JavaRuntime.getExecutionEnvironmentsManager().getEnvironment(javaProfiles[j]);
String systemPackages = getSystemPackages(env, profileProps);
ee = profileProps.getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT);

Check warning on line 443 in build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java

View check run for this annotation

Jenkins - eclipse-pde / Compiler and API Tools

Deprecation 

NORMAL:
The field Constants.FRAMEWORK_EXECUTIONENVIRONMENT is deprecated

prop = new Hashtable<>();
prop.put(ProfileManager.SYSTEM_PACKAGES, systemPackages);
if (profileName.equals("JavaSE-9")) { //$NON-NLS-1$
eeJava9 = ee;
}
prop.put(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, ee);

Check warning on line 450 in build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java

View check run for this annotation

Jenkins - eclipse-pde / Compiler and API Tools

Deprecation 

NORMAL:
The field Constants.FRAMEWORK_EXECUTIONENVIRONMENT is deprecated
properties.add(prop);
added = true;
}
Expand All @@ -466,7 +470,7 @@
continue;
}
prop.put(ProfileManager.SYSTEM_PACKAGES, systemPackages);
prop.put(Constants.FRAMEWORK_EXECUTIONENVIRONMENT, currentEE);

Check warning on line 473 in build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java

View check run for this annotation

Jenkins - eclipse-pde / Compiler and API Tools

Deprecation 

NORMAL:
The field Constants.FRAMEWORK_EXECUTIONENVIRONMENT is deprecated
previousEE = currentEE;
properties.add(prop);
}
Expand Down
Loading