mirror of
https://github.com/ethauvin/bld.git
synced 2025-04-25 08:17:11 -07:00
Fixed Jpackage main module specification
This commit is contained in:
parent
a4300b37d1
commit
5821022fee
3 changed files with 8 additions and 2 deletions
|
@ -47,6 +47,7 @@ public class JmodOptions extends HashMap<String, String> {
|
||||||
* @param path the location
|
* @param path the location
|
||||||
* @return this map of options
|
* @return this map of options
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("UnusedReturnValue")
|
||||||
public JmodOptions cmds(File path) {
|
public JmodOptions cmds(File path) {
|
||||||
put("--cmds", path.getAbsolutePath());
|
put("--cmds", path.getAbsolutePath());
|
||||||
return this;
|
return this;
|
||||||
|
@ -76,6 +77,7 @@ public class JmodOptions extends HashMap<String, String> {
|
||||||
* @param compression the {@link ZipCompression compression} level
|
* @param compression the {@link ZipCompression compression} level
|
||||||
* @return this map of options
|
* @return this map of options
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("UnusedReturnValue")
|
||||||
public JmodOptions compress(ZipCompression compression) {
|
public JmodOptions compress(ZipCompression compression) {
|
||||||
put("--compress", compression.level);
|
put("--compress", compression.level);
|
||||||
return this;
|
return this;
|
||||||
|
@ -237,6 +239,7 @@ public class JmodOptions extends HashMap<String, String> {
|
||||||
* @param path the location
|
* @param path the location
|
||||||
* @return this map of options
|
* @return this map of options
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("UnusedReturnValue")
|
||||||
public JmodOptions headerFiles(File path) {
|
public JmodOptions headerFiles(File path) {
|
||||||
put("--header-files", path.getAbsolutePath());
|
put("--header-files", path.getAbsolutePath());
|
||||||
return this;
|
return this;
|
||||||
|
@ -270,6 +273,7 @@ public class JmodOptions extends HashMap<String, String> {
|
||||||
* @param path the location
|
* @param path the location
|
||||||
* @return this map of options
|
* @return this map of options
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("UnusedReturnValue")
|
||||||
public JmodOptions legalNotices(File path) {
|
public JmodOptions legalNotices(File path) {
|
||||||
put("--legal-notices", path.getAbsolutePath());
|
put("--legal-notices", path.getAbsolutePath());
|
||||||
return this;
|
return this;
|
||||||
|
@ -303,6 +307,7 @@ public class JmodOptions extends HashMap<String, String> {
|
||||||
* @param path the location
|
* @param path the location
|
||||||
* @return this map of options
|
* @return this map of options
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("UnusedReturnValue")
|
||||||
public JmodOptions libs(File path) {
|
public JmodOptions libs(File path) {
|
||||||
put("--libs", path.getAbsolutePath());
|
put("--libs", path.getAbsolutePath());
|
||||||
return this;
|
return this;
|
||||||
|
@ -347,6 +352,7 @@ public class JmodOptions extends HashMap<String, String> {
|
||||||
* @param path the location
|
* @param path the location
|
||||||
* @return this map of options
|
* @return this map of options
|
||||||
*/
|
*/
|
||||||
|
@SuppressWarnings("UnusedReturnValue")
|
||||||
public JmodOptions manPages(File path) {
|
public JmodOptions manPages(File path) {
|
||||||
put("--man-pages", path.getAbsolutePath());
|
put("--man-pages", path.getAbsolutePath());
|
||||||
return this;
|
return this;
|
||||||
|
|
|
@ -779,7 +779,7 @@ public class JpackageOptions extends HashMap<String, String> {
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("JavadocDeclaration")
|
@SuppressWarnings("JavadocDeclaration")
|
||||||
public JpackageOptions module(String name, String mainClass) {
|
public JpackageOptions module(String name, String mainClass) {
|
||||||
put("--module-name", name + "/" + mainClass);
|
put("--module", name + "/" + mainClass);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -371,7 +371,7 @@ public class TestJpackageOperation {
|
||||||
assertEquals("name", options.get("--module"));
|
assertEquals("name", options.get("--module"));
|
||||||
|
|
||||||
options.module("name", "class");
|
options.module("name", "class");
|
||||||
assertEquals("name:class", options.get("--module"));
|
assertEquals("name/class", options.get("--module"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue