mirror of
https://github.com/ethauvin/bld.git
synced 2025-04-25 08:17:11 -07:00
Improved @filename support
This commit is contained in:
parent
8118f42285
commit
94225dfb7a
6 changed files with 18 additions and 7 deletions
|
@ -100,7 +100,7 @@ public class JlinkOperation extends AbstractToolProviderOperation<JlinkOperation
|
||||||
return options_;
|
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 {
|
private List<String> parseOptions() throws FileNotFoundException {
|
||||||
var list = new ArrayList<String>();
|
var list = new ArrayList<String>();
|
||||||
|
|
||||||
|
@ -109,10 +109,10 @@ public class JlinkOperation extends AbstractToolProviderOperation<JlinkOperation
|
||||||
while (scanner.hasNext()) {
|
while (scanner.hasNext()) {
|
||||||
var splitLine = scanner.nextLine().split("--");
|
var splitLine = scanner.nextLine().split("--");
|
||||||
for (String args : splitLine) {
|
for (String args : splitLine) {
|
||||||
if (!args.isEmpty()) {
|
if (!args.isBlank()) {
|
||||||
var splitArgs = args.split(" ", 2);
|
var splitArgs = args.split(" ", 2);
|
||||||
list.add("--" + splitArgs[0]);
|
list.add("--" + splitArgs[0]);
|
||||||
if (splitArgs.length > 1 && !splitArgs[1].isEmpty()) {
|
if (splitArgs.length > 1 && !splitArgs[1].isBlank()) {
|
||||||
list.add(splitArgs[1]);
|
list.add(splitArgs[1]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,7 +110,14 @@ public class TestJlinkOperation {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testOptions() {
|
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);
|
assertDoesNotThrow(jlink::execute);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -142,7 +142,8 @@ public class TestJmodOperation {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testOptions() {
|
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);
|
assertDoesNotThrow(jpackage::execute);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -199,7 +199,8 @@ public class TestJpackageOperation {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testOptions() {
|
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);
|
assertDoesNotThrow(jpackage::execute);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
src/test/resources/jlink/options_jlink.txt
Normal file
2
src/test/resources/jlink/options_jlink.txt
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
--verbose --version
|
||||||
|
--list-plugins
|
|
@ -1 +1 @@
|
||||||
--verbose --version
|
--verbose
|
Loading…
Add table
Add a link
Reference in a new issue