rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 08:17:11 -07:00
Code Activity

Back out the support for embedded launching

Browse source
This commit is contained in:
Geert Bevin 2024-06-23 20:46:26 -04:00
parent 7f74bb015b
commit 177a2e39af
2 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/rife/bld/BuildExecutor.java
View file

@ -8,7 +8,6 @@ import rife.bld.dependencies.Repository;
import rife.bld.help.HelpHelp; import rife.bld.help.HelpHelp;
import rife.bld.operations.HelpOperation; import rife.bld.operations.HelpOperation;
import rife.bld.operations.exceptions.ExitStatusException; import rife.bld.operations.exceptions.ExitStatusException;
import rife.bld.wrapper.Wrapper;
import rife.ioc.HierarchicalProperties; import rife.ioc.HierarchicalProperties;
import rife.tools.ExceptionUtils; import rife.tools.ExceptionUtils;
@ -272,18 +271,7 @@ public class BuildExecutor {
* @since 1.5.1 * @since 1.5.1
*/ */
public void start(String[] arguments) { public void start(String[] arguments) {
boolean embedded = false; System.exit(execute(arguments));
if (arguments != null) {
var arg_list = new ArrayList<>(Arrays.asList(arguments));
embedded = arg_list.remove(Wrapper.EMBEDDED_ARGUMENT);
if (embedded) {
arguments = arg_list.toArray(arguments);
}
}
var status = execute(arguments);
if (!embedded) {
System.exit(status);
}
} }
/** /**

8
src/main/java/rife/bld/wrapper/Wrapper.java
View file

@ -34,7 +34,6 @@ import static rife.tools.FileUtils.JAVA_FILE_PATTERN;
*/ */
public class Wrapper { public class Wrapper {
public static final String BUILD_ARGUMENT = "--build"; public static final String BUILD_ARGUMENT = "--build";
public static final String EMBEDDED_ARGUMENT = "--embedded";
static final String MAVEN_CENTRAL = "https://repo1.maven.org/maven2/"; static final String MAVEN_CENTRAL = "https://repo1.maven.org/maven2/";
static final String SONATYPE_SNAPSHOTS = "https://s01.oss.sonatype.org/content/repositories/snapshots/"; static final String SONATYPE_SNAPSHOTS = "https://s01.oss.sonatype.org/content/repositories/snapshots/";
@ -82,12 +81,7 @@ public class Wrapper {
* @since 1.5 * @since 1.5
*/ */
public static void main(String[] arguments) { public static void main(String[] arguments) {
var arg_list = new ArrayList<>(Arrays.asList(arguments)); System.exit(new Wrapper().installAndLaunch(new ArrayList<>(Arrays.asList(arguments))));
var embedded = arg_list.remove(EMBEDDED_ARGUMENT);
var status = new Wrapper().installAndLaunch(arg_list);
if (!embedded) {
System.exit(status);
}
} }
/** /**