commit c106344a210341123bf004c39fdb0956d560139f
author Janak Ramakrishnan <janakr@google.com> Wed Dec 23 05:07:02 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Mon Dec 28 19:43:45 2015 +0000
tree 19dabc694b2f5481f3afad8c919debfccbe329b0
parent 38816e7a10eb28b9bbdb217764e1b799c51ffb2f

Flip the default to preserve spaces in --host_jvm_args when invoking Bazel. The old behavior can still be achieved by passing --noexperimental_preserve_spaces_in_host_jvm_args, but that will go away after a release.

Oh, also enable the option --noexperimental_preserve_spaces_in_host_jvm_args -- turns out we don't get negative booleans automatically.

--
MOS_MIGRATED_REVID=110816311

src/main/cpp/blaze_startup_options_common.cc

diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc
index 28f2a8e..ec9d431 100644
--- a/src/main/cpp/blaze_startup_options_common.cc
+++ b/src/main/cpp/blaze_startup_options_common.cc
@@ -42,8 +42,8 @@
   block_for_lock = true;
   host_jvm_debug = false;
   host_javabase = "";
-  // TODO(janakr): change this to true when ready, then delete it.
-  preserve_spaces_in_host_jvm_args = false;
+  // TODO(janakr): delete this.
+  preserve_spaces_in_host_jvm_args = true;
   batch = false;
   batch_cpu_scheduling = false;
   blaze_cpu = false;
@@ -141,8 +141,12 @@
                  arg, "--experimental_preserve_spaces_in_host_jvm_args")) {
     preserve_spaces_in_host_jvm_args = true;
     option_sources["preserve_spaces_in_host_jvm_args"] = rcfile;
-  } else if ((value = GetUnaryOption(arg, next_arg,
-                                     "--host_jvm_args")) != NULL) {
+  } else if (GetNullaryOption(
+                 arg, "--noexperimental_preserve_spaces_in_host_jvm_args")) {
+    preserve_spaces_in_host_jvm_args = false;
+    option_sources["preserve_spaces_in_host_jvm_args"] = rcfile;
+  } else if ((value = GetUnaryOption(arg, next_arg, "--host_jvm_args")) !=
+             NULL) {
     host_jvm_args.push_back(value);
     option_sources["host_jvm_args"] = rcfile;  // NB: This is incorrect
   } else if ((value = GetUnaryOption(arg, next_arg, "--blaze_cpu")) != NULL) {