[NaCl Addin] Fix to PNaCl lib creation from MSVS

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/WebServer.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 EnvDTE;
   using Microsoft.VisualStudio.VCProjectEngine;
 
   /// <summary>
   /// This class contains the functionality related to the web server which hosts the web page
   /// during debugging.
   /// </summary>
   public class WebServer : IDisposable
   {
     /// <summary>
@@ skipping 36 matching lines @@
       webServerOutputPane_ = outputWindowPane;
 
       // Read port from properties, if invalid port then set to default value.
       int webServerPort;
       if (!int.TryParse(properties.WebServerPort, out webServerPort))
       {
         webServerPort = DefaultWebServerPort;
       }
 
       string webServerExecutable = "python.exe";
-      string webServerArguments = string.Format(
-          "{0}\\examples\\httpd.py --no_dir_check {1}", properties.SDKRootDirectory, webServerPort);
+      string httpd = Path.Combine(properties.SDKRootDirectory, "examples", "httpd.py");
+      if (!File.Exists(httpd))
+          httpd = Path.Combine(properties.SDKRootDirectory, "tools", "httpd.py");
+      string webServerArguments = httpd + " --no_dir_check " + webServerPort;
 
       // Start the web server process.
       try
       {
         webServer_ = new System.Diagnostics.Process();
         webServer_.StartInfo.CreateNoWindow = true;
         webServer_.StartInfo.UseShellExecute = false;
         webServer_.StartInfo.RedirectStandardOutput = true;
         webServer_.StartInfo.RedirectStandardError = true;
         webServer_.StartInfo.FileName = webServerExecutable;
@@ skipping 56 matching lines @@
     /// Receives output from the web server process to display in the Visual Studio UI.
     /// </summary>
     /// <param name="sender">The parameter is not used.</param>
     /// <param name="e">Contains the data to display.</param>
     private void WebServerMessageReceive(object sender, System.Diagnostics.DataReceivedEventArgs e)
     {
       webServerOutputPane_.OutputString(e.Data + "\n");
     }
   }
 }