[VS AddIn] Fix default library paths.

visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/XamlParser.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.
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.IO;
 
 using Microsoft.Build.Framework;
@@ skipping 31 matching lines @@
             m_typeFunctionMap = new Dictionary<Type, Action<CommandLineBuilder, BaseProperty, string>>
             {
                 { typeof(StringListProperty), GenerateArgumentStringList },
                 { typeof(StringProperty), GenerateArgumentString },
                 { typeof(IntProperty), GenerateArgumentInt },
                 { typeof(BoolProperty), GenerateArgumentBool },
                 { typeof(EnumProperty), GenerateArgumentEnum }
             };
         }
 
-        public string Parse(ITaskItem taskItem, bool fullOutputName)
+        public string Parse(ITaskItem taskItem, bool fullOutputName, string extension)

[binji, 2013/11/19 21:57:16]

this looks like it only changes the output file's extension, maybe change the
variable name to reflect that?

[Sam Clegg, 2013/11/19 23:21:24]

Done.

         {
             CommandLineBuilder builder = new CommandLineBuilder();
 
             foreach (string name in taskItem.MetadataNames)
             {
                 string value = taskItem.GetMetadata(name);
+                if (extension != null && name == "OutputFile")
+                {
+                    value = Path.ChangeExtension(value, extension);
+                }
                 if (fullOutputName && name == "ObjectFileName")
                 {
                     if ((File.GetAttributes(value) & FileAttributes.Directory) != 0)
                     {
                         value = Path.Combine(value, Path.GetFileName(taskItem.ItemSpec));
                         value = Path.ChangeExtension(value, ".obj");
                     }
                 }
                 AppendArgumentForProperty(builder, name, value);
             }
@@ skipping 100 matching lines @@
         } // class
 
         private Rule m_parsedBuildRule;
         private Dictionary<string, PropertyWrapper> ToolProperties { get; set; }
 
         // function mapping for easy property function calling
         private Dictionary<Type, Action<CommandLineBuilder, BaseProperty, string>> m_typeFunctionMap;
     } // XamlParser
 } // namespace NaCl.Build.CPPTasks