2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 00:07:12 -07:00

Improved @filename support

This commit is contained in:
Erik C. Thauvin 2024-08-02 21:33:33 -07:00
parent 8118f42285
commit 94225dfb7a
Signed by: erik
GPG key ID: 776702A6A2DA330E
6 changed files with 18 additions and 7 deletions

View file

@ -100,7 +100,7 @@ public class JlinkOperation extends AbstractToolProviderOperation<JlinkOperation
return options_;
}
// Shouldn't be needed, but for some reason jlink doesn't like @filename when called via ToolProvider
// Shouldn't be needed, but jlink doesn't support @filename when called via ToolProvider
private List<String> parseOptions() throws FileNotFoundException {
var list = new ArrayList<String>();
@ -109,10 +109,10 @@ public class JlinkOperation extends AbstractToolProviderOperation<JlinkOperation
while (scanner.hasNext()) {
var splitLine = scanner.nextLine().split("--");
for (String args : splitLine) {
if (!args.isEmpty()) {
if (!args.isBlank()) {
var splitArgs = args.split(" ", 2);
list.add("--" + splitArgs[0]);
if (splitArgs.length > 1 && !splitArgs[1].isEmpty()) {
if (splitArgs.length > 1 && !splitArgs[1].isBlank()) {
list.add(splitArgs[1]);
}
}

View file

@ -110,7 +110,14 @@ public class TestJlinkOperation {
@Test
void testOptions() {
var jlink = new JlinkOperation().options("src/test/resources/jlink/options_verbose.txt");
var jlink = new JlinkOperation().options("src/test/resources/jlink/options_verbose.txt",
"src/test/resources/jlink/options_version.txt");
assertDoesNotThrow(jlink::execute);
}
@Test
void testParseOptions() {
var jlink = new JlinkOperation().options("src/test/resources/jlink/options_jlink.txt");
assertDoesNotThrow(jlink::execute);
}

View file

@ -142,7 +142,8 @@ public class TestJmodOperation {
@Test
void testOptions() {
var jpackage = new JpackageOperation().options("src/test/resources/jlink/options_version.txt");
var jpackage = new JpackageOperation().options("src/test/resources/jlink/options_verbose.txt",
"src/test/resources/jlink/options_version.txt");
assertDoesNotThrow(jpackage::execute);
}

View file

@ -199,7 +199,8 @@ public class TestJpackageOperation {
@Test
void testOptions() {
var jpackage = new JpackageOperation().options("src/test/resources/jlink/options_verbose.txt");
var jpackage = new JpackageOperation().options("src/test/resources/jlink/options_verbose.txt",
"src/test/resources/jlink/options_version.txt");
assertDoesNotThrow(jpackage::execute);
}

View file

@ -0,0 +1,2 @@
--verbose --version
--list-plugins

View file

@ -1 +1 @@
--verbose --version
--verbose