| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #include "tools/gn/setup.h" | 5 #include "tools/gn/setup.h" |
| 6 | 6 |
| 7 #include <stdlib.h> | 7 #include <stdlib.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 std::string python_path; | 313 std::string python_path; |
| 314 if (base::GetAppOutput(kGetPython, &python_path)) { | 314 if (base::GetAppOutput(kGetPython, &python_path)) { |
| 315 TrimWhitespaceASCII(python_path, TRIM_ALL, &python_path); | 315 TrimWhitespaceASCII(python_path, TRIM_ALL, &python_path); |
| 316 if (scheduler_.verbose_logging()) | 316 if (scheduler_.verbose_logging()) |
| 317 scheduler_.Log("Found python", python_path); | 317 scheduler_.Log("Found python", python_path); |
| 318 } else { | 318 } else { |
| 319 scheduler_.Log("WARNING", "Could not find python on path, using " | 319 scheduler_.Log("WARNING", "Could not find python on path, using " |
| 320 "just \"python.exe\""); | 320 "just \"python.exe\""); |
| 321 python_path = "python.exe"; | 321 python_path = "python.exe"; |
| 322 } | 322 } |
| 323 build_settings_.set_python_path(base::FilePath(UTF8ToUTF16(python_path))); | 323 build_settings_.set_python_path( |
| 324 base::FilePath(base::UTF8ToUTF16(python_path))); |
| 324 #else | 325 #else |
| 325 build_settings_.set_python_path(base::FilePath("python")); | 326 build_settings_.set_python_path(base::FilePath("python")); |
| 326 #endif | 327 #endif |
| 327 } | 328 } |
| 328 | 329 |
| 329 bool Setup::RunConfigFile() { | 330 bool Setup::RunConfigFile() { |
| 330 if (scheduler_.verbose_logging()) | 331 if (scheduler_.verbose_logging()) |
| 331 scheduler_.Log("Got dotfile", FilePathToUTF8(dotfile_name_)); | 332 scheduler_.Log("Got dotfile", FilePathToUTF8(dotfile_name_)); |
| 332 | 333 |
| 333 dotfile_input_file_.reset(new InputFile(SourceFile("//.gn"))); | 334 dotfile_input_file_.reset(new InputFile(SourceFile("//.gn"))); |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 } | 426 } |
| 426 | 427 |
| 427 void DependentSetup::RunPreMessageLoop() { | 428 void DependentSetup::RunPreMessageLoop() { |
| 428 CommonSetup::RunPreMessageLoop(); | 429 CommonSetup::RunPreMessageLoop(); |
| 429 } | 430 } |
| 430 | 431 |
| 431 bool DependentSetup::RunPostMessageLoop() { | 432 bool DependentSetup::RunPostMessageLoop() { |
| 432 return CommonSetup::RunPostMessageLoop(); | 433 return CommonSetup::RunPostMessageLoop(); |
| 433 } | 434 } |
| 434 | 435 |
| OLD | NEW |