| OLD | NEW |
| 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 | 4 |
| 5 namespace NaCl.Build.CPPTasks | 5 namespace NaCl.Build.CPPTasks |
| 6 { | 6 { |
| 7 using System; | 7 using System; |
| 8 using System.IO; | 8 using System.IO; |
| 9 using System.Collections.Generic; | 9 using System.Collections.Generic; |
| 10 | 10 |
| 11 /// <summary> | 11 /// <summary> |
| 12 /// TODO: Update summary. | 12 /// TODO: Update summary. |
| 13 /// </summary> | 13 /// </summary> |
| 14 public class SDKUtilities | 14 public class SDKUtilities |
| 15 { | 15 { |
| 16 // The first version of pepper with a known working PNaCl toolchain | 16 // The first version of pepper with a known working PNaCl toolchain |
| 17 public const int MinPNaCLSDKVersion = 24; | 17 public const int MinPNaCLSDKVersion = 25; |
| 18 public const int MinPNaCLSDKRevision = 166868; | 18 public const int MinPNaCLSDKRevision = 168269; |
| 19 | 19 |
| 20 /// <summary> | 20 /// <summary> |
| 21 /// Find python executable in user's PATH. | 21 /// Find python executable in user's PATH. |
| 22 /// </summary> | 22 /// </summary> |
| 23 public static bool FindPython() | 23 public static bool FindPython() |
| 24 { | 24 { |
| 25 string envvar = Environment.GetEnvironmentVariable("Path", Environme
ntVariableTarget.Process); | 25 string envvar = Environment.GetEnvironmentVariable("Path", Environme
ntVariableTarget.Process); |
| 26 List<string> pathList = new List<string>(envvar.Split(';')); | 26 List<string> pathList = new List<string>(envvar.Split(';')); |
| 27 foreach (string path in pathList) | 27 foreach (string path in pathList) |
| 28 { | 28 { |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 int sdkRevision; | 87 int sdkRevision; |
| 88 int sdkVersion = GetSDKVersion(root, out sdkRevision); | 88 int sdkVersion = GetSDKVersion(root, out sdkRevision); |
| 89 if (sdkVersion > version) | 89 if (sdkVersion > version) |
| 90 return true; | 90 return true; |
| 91 if (sdkVersion == version && sdkRevision >= revision) | 91 if (sdkVersion == version && sdkRevision >= revision) |
| 92 return true; | 92 return true; |
| 93 return false; | 93 return false; |
| 94 } | 94 } |
| 95 } | 95 } |
| 96 } | 96 } |
| OLD | NEW |