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

Add sync tasks for eclipse resources #108

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Add sync tasks for eclipse resources #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dfb600
Add sync tasks for eclipse resources
Nightenom Jan 24, 2024
fef4582
Add comment to edge case
Nightenom Jan 25, 2024
46c9067
Add to debug task, not exactly correct, but should work ~= logically …
Nightenom Feb 6, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ repo
.classpath
.project
bin
/.vscode/

# intellij
out
Expand Down
36 changes: 36 additions & 0 deletions common/src/main/java/net/neoforged/gradle/common/runs/ide/IdeRunIntegrationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
import org.gradle.api.plugins.ExtensionAware;
import org.gradle.api.provider.ListProperty;
import org.gradle.api.provider.Provider;
import org.gradle.api.tasks.Copy;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.TaskProvider;
import org.gradle.language.jvm.tasks.ProcessResources;
import org.gradle.plugins.ide.eclipse.model.EclipseModel;
import org.gradle.plugins.ide.idea.model.IdeaModel;
import org.gradle.plugins.ide.idea.model.IdeaProject;
Expand All @@ -34,9 +36,11 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -133,6 +137,7 @@ public void eclipse(Project project, EclipseModel eclipse) {

final RunImpl runImpl = (RunImpl) run;
final TaskProvider<?> ideBeforeRunTask = createIdeBeforeRunTask(project, name, run, runImpl);
ideBeforeRunTask.configure(task -> addEclipseCopyResourcesTasks(eclipse, run, t -> task.dependsOn(t)));

try {
final GradleLaunchConfig idePreRunTask = GradleLaunchConfig.builder(eclipse.getProject().getName())
Expand Down Expand Up @@ -210,6 +215,37 @@ private TaskProvider<?> createIdeBeforeRunTask(Project project, String name, Run
return ideBeforeRunTask;
}

private void addEclipseCopyResourcesTasks(EclipseModel eclipse, Run run, Consumer<TaskProvider<?>> tasksConsumer) {
for (SourceSet sourceSet : run.getModSources().get()) {
final Project sourceSetProject = SourceSetUtils.getProject(sourceSet);

final String taskName = CommonRuntimeUtils.buildTaskName("eclipseCopy", sourceSet.getProcessResourcesTaskName());
final TaskProvider<?> eclipseResourcesTask;

if (sourceSetProject.getTasks().findByName(taskName) != null) {
eclipseResourcesTask = sourceSetProject.getTasks().named(taskName);
}
else {
eclipseResourcesTask = sourceSetProject.getTasks().register(taskName, Copy.class, task -> {
final TaskProvider<ProcessResources> defaultProcessResources = sourceSetProject.getTasks().named(sourceSet.getProcessResourcesTaskName(), ProcessResources.class);
task.from(defaultProcessResources.get().getDestinationDir());
Path outputDir = eclipse.getClasspath().getDefaultOutputDir().toPath();
if (outputDir.endsWith("default")) {
marchermans marked this conversation as resolved.
Show resolved Hide resolved
// sometimes it has default value from org.gradle.plugins.ide.eclipse.internal.EclipsePluginConstants#DEFAULT_PROJECT_OUTPUT_PATH
// which has /default on end that is not present in the final outputDir in eclipse/buildship
// (output of getDefaultOutputDir() should be just project/bin/)
outputDir = outputDir.getParent();
}
task.into(outputDir.resolve(sourceSet.getName()));

task.dependsOn(defaultProcessResources);
});
}

tasksConsumer.accept(eclipseResourcesTask);
}
}

private static void writeLaunchToFile(Project project, String fileName, LaunchConfig config) {
final File file = project.file(String.format(".eclipse/configurations/%s.launch", fileName));
file.getParentFile().mkdirs();
Expand Down
Loading