Support explicitly specifying a location for jvm.out

Allows users to monitor server output without needing to fish the output base.
Windows support is copied more or less verbatim from recommendations, I unfortunately
don't know how to test this on windows.

PiperOrigin-RevId: 183674130

1 files changed, 19 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
index 97ed798f53..c2290ca917 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
@@ -147,6 +147,25 @@ public class BlazeServerStartupOptions extends OptionsBase {
   )
   public PathFragment outputUserRoot;
 
+  /**
+   * Note: This option is only used by the C++ client, never by the Java server.
+   * It is included here to make sure that the option is documented in the help
+   * output, which is auto-generated by Java code.
+   */
+  @Option(
+    name = "server_jvm_out",
+    defaultValue = "null", // NOTE: purely decorative!  See class docstring.
+    category = "server startup",
+    documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
+    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOSES_INCREMENTAL_STATE},
+    converter = OptionsUtils.PathFragmentConverter.class,
+    valueHelp = "<path>",
+    help =
+        "The location to write the server's JVM's output. If unset then defaults to a location "
+            + "in output_base."
+  )
+  public PathFragment serverJvmOut;
+
   @Option(
     name = "workspace_directory",
     defaultValue = "",