NaCl VS Add-in User Changed Properties Fix

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.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 EnvDTE;
   using EnvDTE80;
@@ skipping 167 matching lines @@
         if (string.IsNullOrEmpty(properties.NaClAddInVersion))
         {
           // Set the NaCl add-in version so that it is stored in the project file.
           properties.SetProperty("ConfigurationGeneral", "NaClAddInVersion", naclAddInVersion);
           
           // Expand the CHROME_PATH variable to its full path.
           string expandedChrome = properties.GetProperty(
               "WindowsLocalDebugger", "LocalDebuggerCommand");
           properties.SetProperty("WindowsLocalDebugger", "LocalDebuggerCommand", expandedChrome);
 
+          // Change the library includes to have the appropriate extension.
+          string libs = properties.GetProperty("Link", "AdditionalDependencies");
+          if (properties.ProjectPlatform == PropertyManager.ProjectPlatformType.NaCl)
+          {
+            libs = libs.Replace(".lib", string.Empty);
+          }
+          else if (properties.ProjectPlatform == PropertyManager.ProjectPlatformType.Pepper)
+          {
+            string[] libsList = libs.Split(';');

[noelallen1, 2012/08/09 18:19:45]

Doesn't '\n' also work as a delimiter when you enter the names?  Pls double
check.

[tysand, 2012/08/09 18:23:38]

Double checked, and Visual Studio will automatically convert to the semi-colon
delimited list if entered with newlines.
On 2012/08/09 18:19:45, noelallen1 wrote:

+            libs = string.Empty;
+            foreach (string lib in libsList)
+            {
+              string baseLibName = lib.Replace(".lib", string.Empty);
+              if (!string.IsNullOrWhiteSpace(lib))
+              {
+                libs = string.Concat(libs, baseLibName, ".lib;");

[noelallen1, 2012/08/09 18:19:45]

Trailing ;?

[tysand, 2012/08/09 18:23:38]

Verified this is a non-issue.
On 2012/08/09 18:19:45, noelallen1 wrote:

+              }
+            }
+          }
+
+          properties.SetProperty("Link", "AdditionalDependencies", libs);
+
           // Work around for issue 140162. Forces some properties to save to the project file.
           PerformPropertyFixes(config);
         }
       }
     }
 
     /// <summary>
     /// Takes a project configuration and sets values in the project file to work around some
     /// problems in Visual Studio. This is a work around for issue 140162.
     /// </summary>
     /// <param name="config">A configuration that needs modification.</param>
     private void PerformPropertyFixes(VCConfiguration config)
     {
       IVCRulePropertyStorage debugger = config.Rules.Item("WindowsLocalDebugger");
       string arguments = debugger.GetUnevaluatedPropertyValue("LocalDebuggerCommandArguments");
       debugger.SetPropertyValue("LocalDebuggerCommandArguments", arguments);
+
+      IVCRulePropertyStorage directories = config.Rules.Item("ConfigurationDirectories");
+      string includePath = directories.GetUnevaluatedPropertyValue("IncludePath");
+      string libraryPath = directories.GetUnevaluatedPropertyValue("LibraryPath");
+      directories.SetPropertyValue("IncludePath", includePath);
+      directories.SetPropertyValue("LibraryPath", libraryPath);
+
+      // Pepper specific:
+      if (config.Platform.Name == Strings.PepperPlatformName)
+      {
+        string executablePath = directories.GetUnevaluatedPropertyValue("ExecutablePath");
+        directories.SetPropertyValue("ExecutablePath", executablePath);
+      }
+
+      // NaCl Platform Specific:
+      if (config.Platform.Name == Strings.NaClPlatformName)
+      {
+        IVCRulePropertyStorage general = config.Rules.Item("ConfigurationGeneral");
+        string outdir = general.GetUnevaluatedPropertyValue("OutDir");
+        string intdir = general.GetUnevaluatedPropertyValue("IntDir");
+        string irtPath = general.GetUnevaluatedPropertyValue("NaClIrtPath");
+        general.SetPropertyValue("NaClIrtPath", irtPath);
+        general.SetPropertyValue("OutDir", outdir);
+        general.SetPropertyValue("IntDir", intdir);
+      }
     }
 
     /// <summary>
     /// During the build process we dynamically put the add-in version number into the add-in
     /// description.  This function extracts that version number.
     /// </summary>
     /// <returns>The add-in version number.</returns>
     private string GetAddInVersionFromDescription()
     {
       string naclAddinVersion = "missing";
@@ skipping 55 matching lines @@
         }
         else if (properties.ProjectPlatform == PropertyManager.ProjectPlatformType.Pepper)
         {
           debugger_ = new PluginDebuggerVS(dte_, properties);
           webServer_ = new WebServer(webServerOutputPane_, properties);
         }
       }
     }
   }
 }