eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix rebuilding in Eclipse when dependant project changes

Browse Source
This commit is contained in:
Alexey Andreev 2015-05-10 15:00:50 +03:00
parent 578c2ce4b8
commit 2f0ca6059c
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java
View File

@ -50,6 +50,7 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
private SourceFileProvider[] sourceProviders; private SourceFileProvider[] sourceProviders;
private Set<IProject> usedProjects = new HashSet<>(); private Set<IProject> usedProjects = new HashSet<>();
private static Map<TeaVMProfile, Set<String>> profileClasses = new WeakHashMap<>(); private static Map<TeaVMProfile, Set<String>> profileClasses = new WeakHashMap<>();
private static Map<TeaVMProfile, Set<String>> profileClassNames = new WeakHashMap<>();
private static Pattern newLinePattern = Pattern.compile("\\r|\\n|\\r\\n"); private static Pattern newLinePattern = Pattern.compile("\\r|\\n|\\r\\n");
@Override @Override
@ -58,6 +59,8 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
projectSettings.load(); projectSettings.load();
TeaVMProfile profiles[] = getEnabledProfiles(projectSettings); TeaVMProfile profiles[] = getEnabledProfiles(projectSettings);
monitor.beginTask("Running TeaVM", profiles.length * TICKS_PER_PROFILE); monitor.beginTask("Running TeaVM", profiles.length * TICKS_PER_PROFILE);
usedProjects = new HashSet<>();
Set<IProject> localUsedProjects = usedProjects;
try { try {
prepareClassPath(); prepareClassPath();
ClassLoader classLoader = new URLClassLoader(classPath, TeaVMProjectBuilder.class.getClassLoader()); ClassLoader classLoader = new URLClassLoader(classPath, TeaVMProjectBuilder.class.getClassLoader());
@ -65,14 +68,15 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, TICKS_PER_PROFILE); SubProgressMonitor subMonitor = new SubProgressMonitor(monitor, TICKS_PER_PROFILE);
buildProfile(kind, subMonitor, profile, classLoader); buildProfile(kind, subMonitor, profile, classLoader);
} }
localUsedProjects.addAll(usedProjects);
} finally { } finally {
monitor.done(); monitor.done();
sourceContainers = null; sourceContainers = null;
classFileContainers = null; classFileContainers = null;
classPath = null; classPath = null;
usedProjects.clear(); usedProjects = null;
} }
return !usedProjects.isEmpty() ? usedProjects.toArray(new IProject[0]) : null; return !localUsedProjects.isEmpty() ? localUsedProjects.toArray(new IProject[0]) : null;
} }
private TeaVMProfile[] getEnabledProfiles(TeaVMProjectSettings settings) { private TeaVMProfile[] getEnabledProfiles(TeaVMProjectSettings settings) {
@ -129,7 +133,9 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
removeMarkers(profile); removeMarkers(profile);
putMarkers(tool.getDependencyInfo().getCallGraph(), tool.getProblemProvider().getProblems(), putMarkers(tool.getDependencyInfo().getCallGraph(), tool.getProblemProvider().getProblems(),
profile); profile);
setClasses(profile, classesToResources(tool.getClasses())); Set<String> classNames = new HashSet<String>(tool.getClasses());
profileClassNames.put(profile, classNames);
setClasses(profile, classesToResources(classNames));
refreshTarget(tool.getTargetDirectory()); refreshTarget(tool.getTargetDirectory());
} }
if (!monitor.isCanceled()) { if (!monitor.isCanceled()) {
@ -198,6 +204,10 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
return true; return true;
} }
} }
Set<String> classNames = profileClassNames.get(profile);
if (classNames != null) {
classesToResources(classNames);
}
return false; return false;
} }
@ -493,7 +503,7 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
} }
projects.add(project); projects.add(project);
IJavaProject javaProject = JavaCore.create(project); IJavaProject javaProject = JavaCore.create(project);
for (IClasspathEntry entry : javaProject.getRawClasspath()) { for (IClasspathEntry entry : javaProject.getResolvedClasspath(true)) {
if (entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) { if (entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
project = (IProject)root.findMember(entry.getPath()); project = (IProject)root.findMember(entry.getPath());
queue.add(project); queue.add(project);