Add PNaCl support for VS addin.

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/PropertyManager.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.Collections.Generic;
   using System.Linq;
   using System.Windows.Forms;
@@ skipping 16 matching lines @@
     /// The target configuration and platform to read from.
     /// </summary>
     private VCConfiguration configuration_;
 
     /// <summary>
     /// Constructs the property manager. Sets the platform type to Other which invalidates use
     /// of the property manager until SetTarget is called with a valid target.
     /// </summary>
     public PropertyManager()
     {
-      ProjectPlatform = ProjectPlatformType.Other;
+      PlatformType = ProjectPlatformType.Other;
     }
 
     /// <summary>
     /// Specifies the type of plug-in being run in this debug session.
     /// </summary>
     public enum ProjectPlatformType
     {
       /// <summary>
       /// Represents all non-pepper/non-nacl platform types.
       /// </summary>
       Other,
 
       /// <summary>
       /// Indicates project platform is a trusted plug-in (nexe).
       /// </summary>
       NaCl,
 
       /// <summary>
       /// Indicates project platform is an untrusted plug-in.
       /// </summary>
       Pepper
     }
 
     /// <summary>
     /// Gets or sets the current project platform type. This indicates Pepper, NaCl, or Other type
     /// of project. If this is set to Other then it is invalid to read the properties.
     /// </summary>
-    public ProjectPlatformType ProjectPlatform { get; protected set; }
+    public ProjectPlatformType PlatformType { get; protected set; }
+
+    /// <summary>
+    /// Gets or sets the current project platform name.
+    /// </summary>
+    public string PlatformName { get; protected set; }
 
     /// <summary>
     /// Gets or sets the full path to the output assembly.
     /// </summary>
     public virtual string PluginAssembly
     {
       get
       {
         AssertValidPlatform();
         VCLinkerTool linker = configuration_.Tools.Item("VCLinkerTool");
@@ skipping 156 matching lines @@
       {
       }
     }
 
     /// <summary>
     /// Return true if the given platform is a NaCl platform.
     /// </summary>
     public static bool IsNaClPlatform(string platformName)
     {
         return platformName.Equals(Strings.NaCl32PlatformName, StringComparison.OrdinalIgnoreCase) ||
-               platformName.Equals(Strings.NaCl64PlatformName, StringComparison.OrdinalIgnoreCase);
+               platformName.Equals(Strings.NaCl64PlatformName, StringComparison.OrdinalIgnoreCase) ||
+               platformName.Equals(Strings.PNaClPlatformName, StringComparison.OrdinalIgnoreCase);
     }
 
     /// <summary>
+    /// Return true if the given platform is the PNaCl platform.
+    /// </summary>
+    public bool IsPNaCl()
+    {
+        return PlatformName.Equals(Strings.PNaClPlatformName, StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
     /// Return true if the given platform is a PPAPI platform.
     /// </summary>
     public static bool IsPepperPlatform(string platformName)
     {
         return platformName.Equals(Strings.PepperPlatformName, StringComparison.OrdinalIgnoreCase);
     }
 
     /// <summary>
     /// Sets the target project, platform, and configuration to get settings from.
     /// </summary>
     /// <param name="proj">Project to read settings from.</param>
     /// <param name="targetPlatformName">Platform type to read settings from.</param>
     /// <param name="targetConfigName">Configuration to read from (Debug or Release).</param>
     public void SetTarget(Project proj, string targetPlatformName, string targetConfigName)
     {
       // Set the project platform.  If it is set to Other then no settings are valid to be read.
-      if (IsPepperPlatform(targetPlatformName))
-      {
-        ProjectPlatform = ProjectPlatformType.Pepper;
-      }
-      else if (IsNaClPlatform(targetPlatformName))
-      {
-        ProjectPlatform = ProjectPlatformType.NaCl;
-      }
-      else
-      {
-        ProjectPlatform = ProjectPlatformType.Other;
+      SetPlatform(targetPlatformName);
+      if (!IsPepperPlatform(targetPlatformName) && !IsNaClPlatform(targetPlatformName))
         return;
-      }
 
       // We don't support non-visual C/C++ projects.
       if (!Utility.IsVisualCProject(proj))
       {
-        ProjectPlatform = ProjectPlatformType.Other;
+        PlatformType = ProjectPlatformType.Other;
         return;
       }
 
       // Set the member variables for configuration and project to the target.
       project_ = (VCProject)proj.Object;
       foreach (VCConfiguration config in project_.Configurations)
       {
         if (config.ConfigurationName == targetConfigName &&
             config.Platform.Name == targetPlatformName)
         {
@@ skipping 10 matching lines @@
     public void SetTarget(VCConfiguration config)
     {
       if (config == null)
       {
         throw new ArgumentNullException("Config");
       }
 
       configuration_ = config;
       project_ = config.project;
 
-      if (IsPepperPlatform(config.Platform.Name))
+      SetPlatform(config.Platform.Name);
+    }
+
+    private void SetPlatform(string platform)
+    {
+      PlatformName = platform;
+
+      if (IsPepperPlatform(PlatformName))
       {
-        ProjectPlatform = ProjectPlatformType.Pepper;
+        PlatformType = ProjectPlatformType.Pepper;
       }
-      else if (IsNaClPlatform(config.Platform.Name))
+      else if (IsNaClPlatform(PlatformName))
       {
-        ProjectPlatform = ProjectPlatformType.NaCl;
+        PlatformType = ProjectPlatformType.NaCl;
       }
       else
       {
-        ProjectPlatform = ProjectPlatformType.Other;
+        PlatformType = ProjectPlatformType.Other;
       }
     }
 
     /// <summary>
     /// Sets the target project, platform, and configuration to the active start-up project and
     /// selected platform and configuration so that settings are read from them.
     /// </summary>
     /// <param name="dte">The main Visual Studio object.</param>
     public void SetTargetToActive(DTE2 dte)
     {
@@ skipping 21 matching lines @@
       // Get the first start-up project object.
       List<Project> projList = dte.Solution.Projects.OfType<Project>().ToList();
       string startProjectName = startupProjects.GetValue(0) as string;
       Project startProject = projList.Find(proj => proj.UniqueName == startProjectName);
 
       VCConfiguration activeConfig = Utility.GetActiveVCConfiguration(startProject);
 
       // GetActiveVCConfiguration will return null if not a VC project.
       if (activeConfig == null)
       {
-        ProjectPlatform = ProjectPlatformType.Other;
+        PlatformType = ProjectPlatformType.Other;
         return;
       }
 
       SetTarget(activeConfig);
     }
 
     /// <summary>
     /// Reads any generic property from the current target properties.
     /// </summary>
     /// <param name="page">Name of the page where the property is located.</param>
@@ skipping 15 matching lines @@
     {
       IVCRulePropertyStorage pageStorage = configuration_.Rules.Item(page);
       pageStorage.SetPropertyValue(name, value);
     }
 
     /// <summary>
     /// Ensures that the current target has the NaCl platform and throws if not.
     /// </summary>
     private void AssertNaCl()
     {
-      if (ProjectPlatform != ProjectPlatformType.NaCl)
+      if (PlatformType != ProjectPlatformType.NaCl)
       {
         throw new Exception(string.Format(
           "Cannot read NaCl only property on {0} platform", configuration_.Platform.Name));
       }
     }
 
     /// <summary>
     /// Ensures that the current target has the Pepper platform and throws if not.
     /// </summary>
     private void AssertPepper()
     {
-      if (ProjectPlatform != ProjectPlatformType.Pepper)
+      if (PlatformType != ProjectPlatformType.Pepper)
       {
         throw new Exception(string.Format(
           "Cannot read Pepper only property on {0} platform", configuration_.Platform.Name));
       }
     }
 
     /// <summary>
     /// Ensures the current target is either the NaCl or Pepper platform. Throws if not.
     /// </summary>
     private void AssertValidPlatform()
     {
-      if (ProjectPlatform == ProjectPlatformType.Other)
+      if (PlatformType == ProjectPlatformType.Other)
       {
         throw new Exception(string.Format(
           "Unsupported platform type: {0} platform", configuration_.Platform.Name));
       }
     }
   }
 }