{
private final static String startClass = "jalview.bin.Jalview";
+ // not setting this yet due to problem with Jmol
private final static String headlessProperty = "java.awt.headless";
+ // used for headless macOS
+ private final static String macosHeadlessProperty = "apple.awt.UIElement";
+
+ // arguments that assume headless mode
+ private final static String[] assumeHeadlessArgs = { "headless", "output",
+ "image", "structureimage" };
+
/**
* main method for jalview.bin.Launcher. This restarts the same JRE's JVM with
* the same arguments but with memory adjusted based on extracted -jvmmempc
{
if (!LaunchUtils.checkJavaVersion())
{
- System.err.println("WARNING - The Java version being used (Java "
- + LaunchUtils.getJavaVersion()
- + ") may lead to problems. This installation of Jalview should be used with Java "
- + LaunchUtils.getJavaCompileVersion() + ".");
+ jalview.bin.Console
+ .errPrintln("WARNING - The Java version being used (Java "
+ + LaunchUtils.getJavaVersion()
+ + ") may lead to problems. This installation of Jalview should be used with Java "
+ + LaunchUtils.getJavaCompileVersion() + ".");
}
String jvmmempc = null;
boolean wait = true;
boolean quiet = false;
boolean headless = false;
+ boolean assumeheadless = false;
boolean gui = false;
+ boolean help = false;
+ boolean stdout = false;
// must set --debug before --launcher...
boolean launcherstop = false;
boolean launcherprint = false;
boolean launcherwait = false;
ArrayList<String> arguments = new ArrayList<>();
+ String previousArg = null;
+ // set debug first
for (String arg : args)
{
if (arg.equals("--debug"))
{
debug = true;
}
+ }
+ for (String arg : args)
+ {
if (arg.equals("--quiet"))
{
quiet = true;
}
- if (arg.equals("--headless"))
+ else if (arg.equals("--gui"))
{
- headless = true;
+ gui = true;
}
- if (arg.equals("--gui"))
+ else if (arg.equals("--help"))
{
- gui = true;
+ help = true;
}
- if (debug && arg.equals("--launcherprint"))
+ else if (arg.equals("--version"))
{
- launcherprint = true;
+ help = true;
}
- if (debug && arg.equals("--launcherstop"))
+
+ if (!assumeheadless)
{
- launcherstop = true;
+ for (String a : assumeHeadlessArgs)
+ {
+ if (arg.equals("--" + a) || arg.startsWith("--" + a + "="))
+ {
+ assumeheadless = true;
+ }
+ }
}
- if (debug && arg.equals("--launcherwait"))
+
+ if (arg.equals("--output=-")
+ || (arg.equals("-") && "--output".equals(previousArg)))
{
- launcherwait = true;
+ stdout = true;
}
- // this ends the launcher immediately
- if (debug && arg.equals("--launchernowait"))
+
+ if (debug)
{
- wait = false;
+ if (arg.equals("--launcherprint"))
+ {
+ launcherprint = true;
+ }
+ else if (arg.equals("--launcherstop"))
+ {
+ launcherstop = true;
+ }
+ else if (arg.equals("--launcherwait"))
+ {
+ launcherwait = true;
+ }
+ else
+ // this ends the launcher immediately
+ if (arg.equals("--launchernowait"))
+ {
+ wait = false;
+ }
}
+ previousArg = arg;
// Don't add the --launcher... args to Jalview launch
if (arg.startsWith("--launcher"))
{
arguments.add(arg);
}
}
- if (gui)
+ if (help)
+ {
+ // --help takes precedence over --gui
+ headless = true;
+ }
+ else if (gui)
{
// --gui takes precedence over --headless
headless = false;
}
+ else
+ {
+ // --output arguments assume headless mode
+ headless = assumeheadless;
+ }
final String appName = ChannelProperties.getProperty("app_name");
boolean dockIcon = false;
boolean dockName = false;
boolean headlessProp = false;
+ boolean macosHeadlessProp = false;
for (int i = 0; i < command.size(); i++)
{
String arg = command.get(i);
{
headlessProp = true;
}
+ else if (arg.startsWith("-D" + macosHeadlessProperty + "="))
+ {
+ macosHeadlessProp = true;
+ }
}
if (!memSet)
// -Xdock:name=... doesn't actually work :(
// Leaving it in in case it gets fixed
command.add("-Xdock:name=" + appName);
- // this launches WITHOUT an icon in the macOS dock. Could be useful for
- // getdown?
- // command.add("-Dapple.awt.UIElement=false");
// This also does not work for the dock
command.add("-Dcom.apple.mrj.application.apple.menu.about.name="
+ appName);
if (headless && !headlessProp)
{
System.setProperty(headlessProperty, "true");
- command.add("-D" + headlessProperty + "=true");
+ /* not setting this in java invocation of running jalview due to problem with Jmol */
+ if (help)
+ {
+ command.add("-D" + headlessProperty + "=true");
+ }
+ }
+ if (headless && LaunchUtils.isMac && !macosHeadlessProp)
+ {
+ System.setProperty(macosHeadlessProperty, "true");
+ command.add("-D" + macosHeadlessProperty + "=true");
}
String scalePropertyArg = HiDPISetting.getScalePropertyArg();
if (scalePropertyArg != null)
{
- sysout(debug, quiet, "Running " + startClass + " with scale setting "
+ syserr(debug, quiet, "Running " + startClass + " with scale setting "
+ scalePropertyArg);
command.add(scalePropertyArg);
}
if ((Boolean.parseBoolean(System.getProperty("launcherprint", "false"))
|| launcherprint))
{
- sysout(debug, quiet,
+ syserr(debug, quiet,
"LAUNCHER COMMAND: " + String.join(" ", builder.command()));
}
- sysout(debug, quiet,
+ syserr(debug, quiet,
"Running " + startClass + " with "
+ (memSetting == null ? "no memory setting"
: ("memory setting " + memSetting)));
if (Boolean.parseBoolean(System.getProperty("launcherstop", "false"))
|| (debug && launcherstop))
{
- sysout(debug, quiet,
+ syserr(debug, quiet,
"System property 'launcherstop' is set and not 'false'. Exiting.");
System.exit(0);
}
Process process = builder.start();
if (wait || launcherwait)
{
- sysout(debug, quiet, "Launching application process");
+ syserr(debug, quiet, "Launching application process");
process.waitFor();
}
else
{
int waitInt = 0;
- sysout(debug, quiet,
+ syserr(debug, quiet,
"Wait time for application process is " + waitInt + "ms");
process.waitFor(waitInt, TimeUnit.MILLISECONDS);
}
- sysout(debug, quiet, "Launcher process ending");
+ syserr(debug, quiet, "Launcher process ending");
} catch (IOException e)
{
if (e.getMessage().toLowerCase(Locale.ROOT).contains("memory"))
{
- System.err.println("Caught a memory exception: " + e.getMessage());
+ jalview.bin.Console
+ .errPrintln("Caught a memory exception: " + e.getMessage());
// Probably the "Cannot allocate memory" error, try without the memory
// setting
ArrayList<String> commandNoMem = new ArrayList<>();
}
final ProcessBuilder builderNoMem = new ProcessBuilder(
commandNoMem);
- System.err.println("Command without memory setting: "
+ jalview.bin.Console.errPrintln("Command without memory setting: "
+ String.join(" ", builderNoMem.command()));
try
{
}
}
- private static void sysout(boolean debug, boolean quiet, String message)
+ private static void syserr(boolean debug, boolean quiet, String message)
{
if (debug && !quiet)
{
- System.out.println("LAUNCHERDEBUG - " + message);
+ jalview.bin.Console.errPrintln("LAUNCHERDEBUG - " + message);
}
}
git://source.jalview.org / jalview.git / blobdiff