imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-28 04:07:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix and test no cache gen sources (#1183)

Browse Source 
* Fix and test no cache gen sources

* Spotless
This commit is contained in:
modmuss
2024-09-30 23:33:40 +01:00
committed by GitHub
parent e5b785ab41
commit e70ca3d7c1
2 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/net/fabricmc/loom/task/GenerateSourcesTask.java
View File

@@ -250,6 +250,8 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
}
if (!getUseCache().get()) {
getLogger().info("Not using decompile cache.");
try (var timer = new Timer("Decompiled sources")) {
runWithoutCache();
} catch (Exception e) {
@@ -340,19 +342,7 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
final ClassLineNumbers existingLinenumbers = workRequest.lineNumbers();
final ClassLineNumbers lineNumbers = ClassLineNumbers.merge(existingLinenumbers, outputLineNumbers);
if (lineNumbers == null) {
getLogger().info("No line numbers to remap, skipping remapping");
return;
}
Path tempJar = Files.createTempFile("loom", "linenumber-remap.jar");
Files.delete(tempJar);
try (var timer = new Timer("Remap line numbers")) {
remapLineNumbers(lineNumbers, classesInputJar, tempJar);
}
Files.move(tempJar, classesOutputJar, StandardCopyOption.REPLACE_EXISTING);
applyLineNumbers(lineNumbers, classesInputJar, classesOutputJar);
try (var timer = new Timer("Prune cache")) {
decompileCache.prune();
@@ -360,29 +350,34 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
}
private void runWithoutCache() throws IOException {
Path inputJar = getClassesInputJar().getSingleFile().toPath();
final Path outputJar = getSourcesOutputJar().get().getAsFile().toPath();
final Path classesInputJar = getClassesInputJar().getSingleFile().toPath();
final Path sourcesOutputJar = getSourcesOutputJar().get().getAsFile().toPath();
final Path classesOutputJar = getClassesOutputJar().getSingleFile().toPath();
// The final output sources jar
Path workClassesJar = classesInputJar;
if (getUnpickDefinitions().isPresent()) {
try (var timer = new Timer("Unpick")) {
inputJar = unpickJar(inputJar, null);
workClassesJar = unpickJar(workClassesJar, null);
}
}
ClassLineNumbers lineNumbers;
try (var timer = new Timer("Decompile")) {
lineNumbers = runDecompileJob(inputJar, outputJar, null);
lineNumbers = runDecompileJob(workClassesJar, sourcesOutputJar, null);
}
if (Files.notExists(outputJar)) {
if (Files.notExists(sourcesOutputJar)) {
throw new RuntimeException("Failed to decompile sources");
}
getLogger().info("Decompiled sources written to {}", outputJar);
getLogger().info("Decompiled sources written to {}", sourcesOutputJar);
applyLineNumbers(lineNumbers, classesInputJar, classesOutputJar);
}
private void applyLineNumbers(@Nullable ClassLineNumbers lineNumbers, Path classesInputJar, Path classesOutputJar) throws IOException {
if (lineNumbers == null) {
getLogger().info("No line numbers to remap, skipping remapping");
return;
@@ -392,10 +387,10 @@ public abstract class GenerateSourcesTask extends AbstractLoomTask {
Files.delete(tempJar);
try (var timer = new Timer("Remap line numbers")) {
remapLineNumbers(lineNumbers, inputJar, tempJar);
remapLineNumbers(lineNumbers, classesInputJar, tempJar);
}
Files.move(tempJar, outputJar, StandardCopyOption.REPLACE_EXISTING);
Files.move(tempJar, classesOutputJar, StandardCopyOption.REPLACE_EXISTING);
}
private String getCacheKey() {