Skip to content

PDE ClasspathComputer works now #52

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

Merged
haubi merged 1 commit into from
Aug 21, 2026
Merged

PDE ClasspathComputer works now #52

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.tea.library.build/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.21.0",
org.eclipse.tea.core,
org.eclipse.ui.workbench;bundle-version="3.133.0",
org.eclipse.e4.core.di.extensions;bundle-version="0.18.300",
org.eclipse.pde.core;bundle-version="3.19.0",
org.eclipse.pde.core;bundle-version="3.21.300",
org.eclipse.e4.core.contexts;bundle-version="1.12.600",
org.eclipse.tea.core.ui,
org.eclipse.e4.core.di;bundle-version="1.9.500",
Expand Down
105 changes: 1 addition & 104 deletions ...rg.eclipse.tea.library.build/src/org/eclipse/tea/library/build/util/ClasspathUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,16 @@
package org.eclipse.tea.library.build.util;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.internal.core.JavaProject;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.internal.core.ClasspathComputer;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.tea.core.services.TaskingLog;
import org.eclipse.tea.library.build.model.PluginData;
import org.eclipse.tea.library.build.model.WorkspaceData;
Expand All @@ -43,7 +33,6 @@ public class ClasspathUpdater {

private final WorkspaceData wsData;
private Predicate<IProject> predicate;
private Map<String, IPath> sourcePaths = new HashMap<>();

/**
* Creates the updater on top of a {@link WorkspaceData} instance.
Expand All @@ -59,14 +48,6 @@ public void setPredicate(Predicate<IProject> predicate) {
this.predicate = predicate;
}

/**
* @param sourcePaths
* a map from plugin name to source path.
*/
public void setSourcePaths(Map<String, IPath> sourcePaths) {
this.sourcePaths = sourcePaths != null ? sourcePaths : new HashMap<>();
}

public void update(TaskingLog console, IProgressMonitor monitor) {
console.info("running class-path update");
SubMonitor mon = SubMonitor.convert(monitor, 100);
Expand Down Expand Up @@ -95,84 +76,8 @@ public void update(TaskingLog console, IProgressMonitor monitor) {
continue;
}

// PDE may fail to update the classpath based on the original,
// see https://github.com/eclipse-pde/eclipse.pde/pull/497
// But calculating from scratch drops existing attributes and
// destroys the existing order.
// Workaround here merges fresh classpath with the original one.
IClasspathEntry[] origCP = JavaCore.create(project).getRawClasspath();
IClasspathEntry[] freshCP = ClasspathComputer.getClasspath(project, model, null, true, true);
ClasspathComputer.setClasspath(project, model);

// remove trailing slash from source path if any:
for (int i = 0; i < freshCP.length; i++) {
IClasspathEntry old = freshCP[i];
if (old.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
IPath path = old.getPath().removeTrailingSeparator();
freshCP[i] = JavaCore.newSourceEntry(path, old.getInclusionPatterns(),
old.getExclusionPatterns(), old.getOutputLocation(), old.getExtraAttributes());
}
}

Map<IPath, IClasspathEntry> collectedCPofPath = Stream.concat(Stream.of(freshCP), Stream.of(origCP))
.collect(Collectors.toMap(e -> keyOf(e), e -> e, (first, dupe) -> first));

List<IClasspathEntry> mergedCP = new ArrayList<>();
for (final IClasspathEntry orig : origCP) {
final IClasspathEntry collect = collectedCPofPath.remove(keyOf(orig));
if (collect == null) {
continue; // dupe in the original already
}
IClasspathEntry merged = collect;
switch (collect.getEntryKind()) {
case IClasspathEntry.CPE_LIBRARY:
if (collect.getContentKind() == IPackageFragmentRoot.K_BINARY) {
IPath source = sourcePaths.get(collect.getPath().lastSegment()); // override
source = source != null ? source : orig.getSourceAttachmentPath(); // current
source = source != null ? source : collect.getSourceAttachmentPath(); // default
if (!collect.equals(orig) || !Objects.equals(collect.getSourceAttachmentPath(), source)) {
merged = JavaCore.newLibraryEntry(collect.getPath(), source, null,
orig.getAccessRules(), orig.getExtraAttributes(), orig.isExported());
}
}
break;
case IClasspathEntry.CPE_SOURCE:
merged = orig;
break;
case IClasspathEntry.CPE_CONTAINER:
if (!collect.equals(orig)) {
merged = JavaCore.newContainerEntry(collect.getPath(), orig.getAccessRules(),
orig.getExtraAttributes(), orig.isExported());
}
break;
case IClasspathEntry.CPE_PROJECT:
if (!collect.equals(orig)) {
merged = JavaCore.newProjectEntry(collect.getPath(), orig.getAccessRules(),
orig.combineAccessRules(), orig.getExtraAttributes(), orig.isExported());
}
break;
case IClasspathEntry.CPE_VARIABLE:
merged = orig;
break;
}
mergedCP.add(merged);
}

for (IClasspathEntry fresh : freshCP) {
if (collectedCPofPath.remove(keyOf(fresh)) == null) {
continue; // not a new one
}
if (fresh.getEntryKind() == IClasspathEntry.CPE_LIBRARY
&& fresh.getContentKind() == IPackageFragmentRoot.K_BINARY) {
IPath source = sourcePaths.get(fresh.getPath().lastSegment());
if (source != null && !source.equals(fresh.getSourceAttachmentPath())) {
fresh = JavaCore.newLibraryEntry(fresh.getPath(), source, null, fresh.getAccessRules(),
fresh.getExtraAttributes(), fresh.isExported());
}
}
mergedCP.add(fresh);
}

JavaCore.create(project).setRawClasspath(mergedCP.toArray(new IClasspathEntry[mergedCP.size()]), null);
refreshList.add(pd);
} catch (Exception ex) {
console.error("skipped classpath update for " + bundleName + " because of: " + ex);
Expand All @@ -191,12 +96,4 @@ public void update(TaskingLog console, IProgressMonitor monitor) {
monitor.done();
}
}

private static IPath keyOf(IClasspathEntry entry) {
if (PDECore.JRE_CONTAINER_PATH.isPrefixOf(entry.getPath())) {
return PDECore.JRE_CONTAINER_PATH; // entry path contains properties
}
return entry.getPath();
}

}
Loading