Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(799)

Unified Diff: visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/WebServer.cs

Issue 11375004: [NaCl Addin] Fix to PNaCl lib creation from MSVS (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/SDKUtilities.cs ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/WebServer.cs
diff --git a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/WebServer.cs b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/WebServer.cs
index f60a58298c66b6ed2d540d5e9274b56bade47eb6..2d7c144b2ff9385a49ff50feb2a3a98e41a9bbd4 100644
--- a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/WebServer.cs
+++ b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/WebServer.cs
@@ -5,7 +5,7 @@
namespace NativeClientVSAddIn
{
using System;
-
+ using System.IO;
using EnvDTE;
using Microsoft.VisualStudio.VCProjectEngine;
@@ -62,8 +62,10 @@ namespace NativeClientVSAddIn
}
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
« no previous file with comments | « visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/SDKUtilities.cs ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698