From 061a194322f0bfb671cd165c8537495075393c03 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 13 Aug 2023 16:45:02 -0700 Subject: [PATCH 01/10] Added support for run arguments --- src/main/java/rife/bld/help/RunHelp.java | 2 +- .../java/rife/bld/operations/RunOperation.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/rife/bld/help/RunHelp.java b/src/main/java/rife/bld/help/RunHelp.java index 7234807..c4e5fe8 100644 --- a/src/main/java/rife/bld/help/RunHelp.java +++ b/src/main/java/rife/bld/help/RunHelp.java @@ -22,6 +22,6 @@ public class RunHelp implements CommandHelp { return StringUtils.replace(""" Runs the project. - Usage : ${topic}""", "${topic}", topic); + Usage : ${topic} [--args=ARGUMENT...]""", "${topic}", topic); } } diff --git a/src/main/java/rife/bld/operations/RunOperation.java b/src/main/java/rife/bld/operations/RunOperation.java index e185a6b..63679d4 100644 --- a/src/main/java/rife/bld/operations/RunOperation.java +++ b/src/main/java/rife/bld/operations/RunOperation.java @@ -8,6 +8,7 @@ import rife.bld.BaseProject; import rife.tools.FileUtils; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -35,6 +36,7 @@ public class RunOperation extends AbstractProcessOperation { } args.add(mainClass()); args.addAll(runOptions()); + System.out.println(args); return args; } @@ -52,6 +54,22 @@ public class RunOperation extends AbstractProcessOperation { if (project.usesRife2Agent()) { operation.javaOptions().javaAgent(project.getRife2AgentFile()); } + + // parse the run arguments if any + var args = project.arguments(); + while (!args.isEmpty()) { + var arg = args.get(0); + if (arg.startsWith("-")) { + args.remove(0); + if (arg.startsWith("--args=")) { + var runArgs = arg.substring(7); + if (!runArgs.isBlank()) { + runOptions_.addAll(0, Arrays.asList(runArgs.split(" "))); + } + } + } + } + return operation; } From c0418bb60a998daa39caf96ccf57eb905cbb6d0b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 13 Aug 2023 17:15:08 -0700 Subject: [PATCH 02/10] Fixed dangling System.out.println --- src/main/java/rife/bld/operations/RunOperation.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/rife/bld/operations/RunOperation.java b/src/main/java/rife/bld/operations/RunOperation.java index 63679d4..fe766e9 100644 --- a/src/main/java/rife/bld/operations/RunOperation.java +++ b/src/main/java/rife/bld/operations/RunOperation.java @@ -36,7 +36,6 @@ public class RunOperation extends AbstractProcessOperation { } args.add(mainClass()); args.addAll(runOptions()); - System.out.println(args); return args; } From ecb72b6a7d980443a589dc53ad64d71418ed04db Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 13 Aug 2023 17:44:54 -0700 Subject: [PATCH 03/10] Added ARGS_OPTION constant --- .idea/inspectionProfiles/Project_Default.xml | 8 ++++++++ .idea/misc.xml | 1 - src/main/java/rife/bld/help/RunHelp.java | 12 ++++++------ src/main/java/rife/bld/operations/RunOperation.java | 5 +++-- 4 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..1e01b48 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 47e63bd..065a1fd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ -