Add PNaCl support for VS addin.

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PluginDebuggerGDB.cs

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 namespace NativeClientVSAddIn
 {
   using System;
   using System.IO;
   using System.Text;
   using System.Windows.Forms;
   using System.Diagnostics;
 
   using EnvDTE;
   using EnvDTE80;
 
   /// <summary>
   /// This class handles the details of finding a nexe and attaching to it.
   /// </summary>
   public class PluginDebuggerGDB : PluginDebuggerBase
   {
     /// <summary>
-    /// Path to the actual plug-in assembly.
+    /// Path to the actual nexe.
     /// </summary>
-    private string pluginAssembly_;
+    private string targetNexe_;
 
     /// <summary>
-    /// Directory of the plug-in project we are debugging.
+    /// Directory of the project we are debugging.
     /// </summary>
-    private string pluginProjectDirectory_;
+    private string projectDirectory_;
 
     /// <summary>
     /// Path to the NaCl IRT.
     /// </summary>
     private string irtPath_;
 
     /// <summary>
     /// Path to the project's nmf file.
     /// </summary>
     private string manifestPath_;
@@ skipping 14 matching lines @@
     private string gdbInitFileName_;
 
     /// <summary>
     /// Constructs the PluginDebuggerHelper.
     /// </summary>
     /// <param name="dte">Automation object from Visual Studio.</param>
     /// <param name="properties">PropertyManager pointing to a valid project/platform.</param>
     public PluginDebuggerGDB(DTE2 dte, PropertyManager properties)
         : base(dte, properties)
     {
-      string arch = "i686";
-      if (Environment.Is64BitOperatingSystem)
-      {
-        arch = "x86_64";
-      }
+        string arch = "i686";
+        if (Environment.Is64BitOperatingSystem)
+        {
+            arch = "x86_64";
+        }
 
-      if (properties.TargetArchitecture != arch)
-      {
-        MessageBox.Show(string.Format("Debugging of {0} NaCl modules is not possible on this system ({1}).", 
-                                      properties.TargetArchitecture, arch));
-      }
+        if (!properties.IsPNaCl())
+        {
+            if (properties.TargetArchitecture != arch)
+            {
+                MessageBox.Show(string.Format("Debugging of {0} NaCl modules is not possible on this system ({1}).",
+                                              properties.TargetArchitecture, arch));
+            }
+        }
 
       // check chrome version
       string chrome_path = properties.LocalDebuggerCommand;
       FileVersionInfo version_info = FileVersionInfo.GetVersionInfo(chrome_path);
       string file_version = version_info.FileVersion;
       if (file_version != null)
       {
         string major_version = file_version.Split('.')[0];
         int major_version_int = 0;
         try
@@ skipping 35 matching lines @@
                                   file_version, irt_basename);
           if (!File.Exists(irtPath_))
           {
             MessageBox.Show("NaCl IRT not found in chrome install.\nLooking for: " + irtPath_);
             irtPath_ = null;
           }
         }
       }
 
       manifestPath_ = properties.ManifestPath;
-      pluginAssembly_ = properties.PluginAssembly;
-      pluginProjectDirectory_ = properties.ProjectDirectory;
+      targetNexe_ = properties.PluginAssembly;
+
+      if (properties.IsPNaCl())
+      {
+          string basename = Path.GetFileNameWithoutExtension(targetNexe_);
+          targetNexe_ = Path.Combine(Path.GetDirectoryName(targetNexe_),
+                                     basename + "_" + arch + ".nexe");
+
+          if (!File.Exists(targetNexe_))
+          {
+              MessageBox.Show(
+                string.Format("Failed to find nexe to debug: {0}", targetNexe_));
+          }
+      }
+
+      projectDirectory_ = properties.ProjectDirectory;
       gdbPath_ = Path.Combine(
           properties.SDKRootDirectory,
           "toolchain",
           string.Concat("win_x86_", properties.ToolchainName),
           @"bin\x86_64-nacl-gdb.exe");
 
       Debug.WriteLine("Found gdb: {0}", gdbPath_);
       PluginFoundEvent += new EventHandler<PluginFoundEventArgs>(Attach);
     }
 
@@ skipping 75 matching lines @@
       gdbInitFileName_ = Path.GetTempFileName();
       StringBuilder contents = new StringBuilder();
 
       if (!string.IsNullOrEmpty(manifestPath_))
       {
         string manifestEscaped = manifestPath_.Replace("\\", "\\\\");
         contents.AppendFormat("nacl-manifest {0}\n", manifestEscaped);
       }
       else
       {
-        string pluginAssemblyEscaped = pluginAssembly_.Replace("\\", "\\\\");
+        string pluginAssemblyEscaped = targetNexe_.Replace("\\", "\\\\");
         contents.AppendFormat("file \"{0}\"\n", pluginAssemblyEscaped);
       }
 
       // irtPath_ could be null if the irt nexe was not found in the chrome
       // install.
       if (irtPath_ != null)
       {
         string irtPathEscaped = irtPath_.Replace("\\", "\\\\");
         contents.AppendFormat("nacl-irt \"{0}\"\n", irtPathEscaped);
       }
@@ skipping 30 matching lines @@
       contents.AppendLine("continue");
       File.WriteAllText(gdbInitFileName_, contents.ToString());
 
       // Start NaCl-GDB.
       try
       {
         gdbProcess_ = new System.Diagnostics.Process();
         gdbProcess_.StartInfo.UseShellExecute = true;
         gdbProcess_.StartInfo.FileName = gdbPath_;
         gdbProcess_.StartInfo.Arguments = string.Format("-x {0}", gdbInitFileName_);
-        gdbProcess_.StartInfo.WorkingDirectory = pluginProjectDirectory_;
+        gdbProcess_.StartInfo.WorkingDirectory = projectDirectory_;
         gdbProcess_.Start();
       }
       catch (Exception e)
       {
         MessageBox.Show(
             string.Format("NaCl-GDB Start Failed. {0}. Path: {1}", e.Message, gdbPath_));
       }
     }
   }
 }