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

Side by Side Diff: visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs

Issue 66333012: [NaCl AddIn] Update location of PNaCl executables. (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 using System; 4 using System;
5 using System.Collections.Generic; 5 using System.Collections.Generic;
6 using System.Text; 6 using System.Text;
7 using System.Collections; 7 using System.Collections;
8 using System.IO; 8 using System.IO;
9 using System.Reflection; 9 using System.Reflection;
10 using System.Resources; 10 using System.Resources;
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 { 219 {
220 if (!SDKUtilities.FindPython()) 220 if (!SDKUtilities.FindPython())
221 { 221 {
222 Log.LogError("PNaCl compilation requires python in your exec utable path."); 222 Log.LogError("PNaCl compilation requires python in your exec utable path.");
223 return -1; 223 return -1;
224 } 224 }
225 225
226 // The SDK root is five levels up from the compiler binary. 226 // The SDK root is five levels up from the compiler binary.
227 string sdkroot = Path.GetDirectoryName(Path.GetDirectoryName(pat hToTool)); 227 string sdkroot = Path.GetDirectoryName(Path.GetDirectoryName(pat hToTool));
228 sdkroot = Path.GetDirectoryName(Path.GetDirectoryName(sdkroot)); 228 sdkroot = Path.GetDirectoryName(Path.GetDirectoryName(sdkroot));
229 sdkroot = Path.GetDirectoryName(sdkroot);
230 229
231 if (!SDKUtilities.SupportsPNaCl(sdkroot)) 230 if (!SDKUtilities.SupportsPNaCl(sdkroot))
232 { 231 {
233 int revision; 232 int revision;
234 int version = SDKUtilities.GetSDKVersion(sdkroot, out revisi on); 233 int version = SDKUtilities.GetSDKVersion(sdkroot, out revisi on);
235 Log.LogError("The configured version of the NaCl SDK ({0} r{ 1}) is too old " + 234 Log.LogError("The configured version of the NaCl SDK ({0} r{ 1}) is too old " +
236 "for building PNaCl projects.\n" + 235 "for building PNaCl projects.\n" +
237 "Please install at least 24 r{2} using the nacl sdk command " + 236 "Please install at least 24 r{2} using the nacl sdk command " +
238 "line tool.", version, revision, SDKUtilities.M inPNaCLSDKVersion, 237 "line tool.", version, revision, SDKUtilities.M inPNaCLSDKVersion,
239 SDKUtilities.MinPNaCLSDKRevision); 238 SDKUtilities.MinPNaCLSDKRevision);
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 protected override string ToolName 418 protected override string ToolName
420 { 419 {
421 get 420 get
422 { 421 {
423 return NaCLCompilerPath; 422 return NaCLCompilerPath;
424 } 423 }
425 } 424 }
426 425
427 } 426 }
428 } 427 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698