Skip to content

Jlink task improvements #413

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
rob93c merged 2 commits into from
Oct 4, 2025
Merged

Jlink task improvements #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0594c5
Improve jlink task, and change how the output is logged
MartelliEnrico Oct 4, 2025
146b391
Remove redundant log, ignore modified runtime
MartelliEnrico Oct 4, 2025
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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ updateDaemonJvm {
}

def jlink = tasks.register('jlink', JlinkTask) {
options = ['--strip-debug', '--no-header-files', '--no-man-pages']
options = ['--strip-debug', '--no-header-files', '--no-man-pages', '--ignore-modified-runtime']
modules = [
'java.instrument', // for junit
'java.naming', // for logback
Expand Down
37 changes: 11 additions & 26 deletions buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import javax.inject.Inject;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.List;

public abstract class JlinkTask extends DefaultTask {
Expand Down Expand Up @@ -63,49 +62,35 @@ public JlinkTask(ProjectLayout layout, JavaToolchainService javaToolchain) {
public void createJre() {
var installationPath = getJavaCompiler().get().getMetadata().getInstallationPath();

var jlink = installationPath.file("bin/jlink");
var jmods = installationPath.dir("jmods");
var jlink = installationPath.file("bin/jlink").getAsFile();
var jmods = installationPath.dir("jmods").getAsFile();

var jlinkOutput = getOutputDirectory().dir("jre").get().getAsFile();
getFs().delete(deleteSpec -> deleteSpec.delete(jlinkOutput));

var stdout = new ByteArrayOutputStream();
var stderr = new ByteArrayOutputStream();

var result = getExec().exec(execSpec -> {
execSpec.setIgnoreExitValue(true);

var commandLine = new ArrayList<String>();
commandLine.add(jlink.toString());
commandLine.addAll(getOptions().get());
execSpec.setCommandLine(jlink.getAbsolutePath());
execSpec.args(getOptions().get());

if (getIncludeModulePath().get()) {
commandLine.add("--module-path");
commandLine.add(jmods.toString());
execSpec.args("--module-path", jmods.getAbsolutePath());
}
commandLine.add("--add-modules");
commandLine.add(String.join(",", getModules().get()));
commandLine.add("--output");
commandLine.add(jlinkOutput.toString());

execSpec.setCommandLine(commandLine);
execSpec.args("--add-modules", String.join(",", getModules().get()));
execSpec.args("--output", jlinkOutput.getAbsolutePath());

execSpec.setStandardOutput(stdout);
execSpec.setErrorOutput(stderr);
execSpec.setErrorOutput(stdout);
});

var stdoutStr = stdout.toString();
var stderrStr = stderr.toString();

if (!stdoutStr.isEmpty()) {
getLogger().info(stdoutStr);
}

if (result.getExitValue() != 0) {
if (stderrStr.isEmpty()) {
getLogger().log(LogLevel.ERROR, "jlink failed with exit code: {}", result.getExitValue());
} else {
getLogger().log(LogLevel.ERROR, stderrStr);
}
var level = result.getExitValue() == 0 ? LogLevel.INFO : LogLevel.ERROR;
getLogger().log(level, stdoutStr);
}

result.assertNormalExitValue();
Expand Down
Loading