Windows: java launcher no longer calls cmd.exe

See bazelbuild#2190 Closes bazelbuild#5005. Change-Id: If665af264a23be0219c75ae087dd25db74d5e386 PiperOrigin-RevId: 192575414
mmikitka · Apr 12, 2018 · e02a00f · e02a00f
1 parent 0c9f2d4
commit e02a00f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/tools/launcher/java_launcher.cc b/src/tools/launcher/java_launcher.cc
@@ -185,20 +185,14 @@ string JavaBinaryLauncher::CreateClasspathJar(const string& classpath) {
   jar_manifest_file.close();
 
   // Create the command for generating classpath jar.
-  // We pass the command to cmd.exe to use redirection for suppressing output.
   string manifest_jar_path = binary_base_path + rand_id + "-classpath.jar";
   string jar_bin = this->Rlocation(this->GetLaunchInfoByKey(JAR_BIN_PATH));
   vector<string> arguments;
-  arguments.push_back("/c");
+  arguments.push_back("cvfm");
+  arguments.push_back(manifest_jar_path);
+  arguments.push_back(jar_manifest_file_path);
 
-  ostringstream jar_command;
-  jar_command << jar_bin << " cvfm ";
-  jar_command << manifest_jar_path << " ";
-  jar_command << jar_manifest_file_path << " ";
-  jar_command << "> nul";
-  arguments.push_back(jar_command.str());
-
-  if (this->LaunchProcess("cmd.exe", arguments) != 0) {
+  if (this->LaunchProcess(jar_bin, arguments, /* suppressOutput */ true) != 0) {
     die("Couldn't create classpath jar: %s", manifest_jar_path.c_str());
   }
 

diff --git a/src/tools/launcher/launcher.cc b/src/tools/launcher/launcher.cc
@@ -176,8 +176,9 @@ bool BinaryLauncherBase::PrintLauncherCommandLine(
   return has_print_cmd_flag;
 }
 
-ExitCode BinaryLauncherBase::LaunchProcess(
-    const string& executable, const vector<string>& arguments) const {
+ExitCode BinaryLauncherBase::LaunchProcess(const string& executable,
+                                           const vector<string>& arguments,
+                                           bool suppressOutput) const {
   if (PrintLauncherCommandLine(executable, arguments)) {
     return 0;
   }
@@ -194,7 +195,9 @@ ExitCode BinaryLauncherBase::LaunchProcess(
       /* lpProcessAttributes */ NULL,
       /* lpThreadAttributes */ NULL,
       /* bInheritHandles */ FALSE,
-      /* dwCreationFlags */ 0,
+      /* dwCreationFlags */
+          suppressOutput ? CREATE_NO_WINDOW  // no console window => no output
+                         : 0,
       /* lpEnvironment */ NULL,
       /* lpCurrentDirectory */ NULL,
       /* lpStartupInfo */ &startupInfo,

diff --git a/src/tools/launcher/launcher.h b/src/tools/launcher/launcher.h
@@ -66,7 +66,8 @@ class BinaryLauncherBase {
   //             it doesn't include the exectuable itself.
   //             The arguments are expected to be quoted if having spaces.
   ExitCode LaunchProcess(const std::string& executable,
-                         const std::vector<std::string>& arguments) const;
+                         const std::vector<std::string>& arguments,
+                         bool suppressOutput = false) const;
 
   // A launch function to be implemented for a specific language.
   virtual ExitCode Launch() = 0;