fix processing of non-switch arguments

visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/XamlParser.cs

-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
 using Microsoft.Build.Framework;
 using System.Xaml;
 using Microsoft.Build.Framework.XamlTypes;
 using Microsoft.Build.Utilities;
 
 namespace NaCl.Build.CPPTasks
 {
     class XamlParser
     {
         public XamlParser(string path)
         {
             // load and store properties from xaml file
             m_parsedBuildRule = (Rule)XamlServices.Load(path);
 
-            // NOTE: 
-            // There are MSBuild classes which support command line building, 
-            // argument switch encapsulation and more.  Code within VCToolTask, 
-            // a hidden interface, uses some these classes to generate command line 
-            // switches given project settings. As the VCToolTask class is a hidden 
-            // class and the MSBuild documentation is very sparse, we are going 
-            // with a small custom solution.  For reference see the 
+            // NOTE:
+            // There are MSBuild classes which support command line building,
+            // argument switch encapsulation and more.  Code within VCToolTask,
+            // a hidden interface, uses some these classes to generate command line
+            // switches given project settings. As the VCToolTask class is a hidden
+            // class and the MSBuild documentation is very sparse, we are going
+            // with a small custom solution.  For reference see the
             // Microsoft.Build.Tasks.Xaml, Microsoft.Build.Framework.XamlTypes namespaces.
 
             // move the properties to a property name keyed dictionary for faster lookup
             ToolProperties = new Dictionary<string, PropertyWrapper>();
             ToolProperties = m_parsedBuildRule.Properties.ToDictionary(x => x.Name, x => (new PropertyWrapper(x.GetType(), x)));
 
             InitFunctionMap();
         }
 
         private void InitFunctionMap()
@@ skipping 43 matching lines @@
                 builder.AppendSwitchUnquotedIfNotNull(m_parsedBuildRule.SwitchPrefix, result.Switch);
             }
         }
 
         // helper for string-based properties
         private void AppendStringValue(CommandLineBuilder builder, BaseProperty property, string subtype, string value)
         {
             value = value.Trim();
 
             // could cache this SubType test off in property wrapper or somewhere if performance were an issue
+            string switchName = m_parsedBuildRule.SwitchPrefix + property.Switch + property.Separator;

[binji, 2012/10/02 23:43:47]

nit: wrap at 100

             if (subtype == "file" || subtype == "folder")
             {
-                builder.AppendSwitchIfNotNull(m_parsedBuildRule.SwitchPrefix + property.Switch + property.Separator, value);
+                // for switches that contains files or folders we need quoting
+                builder.AppendSwitchIfNotNull(switchName, value);
             }
-            else
+            else if (!string.IsNullOrEmpty(property.Switch))
             {
-                builder.AppendSwitchUnquotedIfNotNull(m_parsedBuildRule.SwitchPrefix + property.Switch + property.Separator, value);
+                builder.AppendSwitchUnquotedIfNotNull(switchName, value);
+            }
+            else if (!string.IsNullOrEmpty(value))
+            {
+                // for non-switchs such as AdditionalOpions we just append the value

[binji, 2012/10/02 23:43:47]

nit:
s/switchs/switches/
s/Opions/Options/

+                builder.AppendTextUnquoted(" " + value);
             }
         }
 
         private void GenerateArgumentStringList(CommandLineBuilder builder, BaseProperty property, string value)
         {
-                        string [] arguments = value.Split(';');
+            string[] arguments = value.Split(';');
 
             foreach (string argument in arguments)
             {
                 if (argument.Length > 0)
                 {
                     StringListProperty casted = (StringListProperty)property;
                     AppendStringValue(builder, property, casted.Subtype, argument);
                 }
             }
         }
@@ skipping 30 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