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

Unified Diff: tools/gn/setup.cc

Issue 213353004: GN: Move towards only using / on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: restore convert_slashes in output path, misc fixes Created 6 years, 9 months 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 | « tools/gn/ninja_toolchain_writer.cc ('k') | tools/gn/source_dir.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/setup.cc
diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc
index 759b40a4d64f600d89d5ac21ae0206a18f3eddcc..728a8eba38bd2df73ae67a30071838c07d9f8a10 100644
--- a/tools/gn/setup.cc
+++ b/tools/gn/setup.cc
@@ -294,11 +294,9 @@ bool Setup::FillSourceDir(const CommandLine& cmdline) {
}
bool Setup::FillBuildDir(const std::string& build_dir) {
- std::string normalized_build_dir = PathToSystem(build_dir);
-
SourceDir resolved =
SourceDirForCurrentDirectory(build_settings_.root_path()).
- ResolveRelativeDir(normalized_build_dir);
+ ResolveRelativeDir(build_dir);
if (resolved.is_null()) {
Err(Location(), "Couldn't resolve build directory.",
"The build directory supplied (\"" + build_dir + "\") was not valid.").
@@ -327,8 +325,8 @@ void Setup::FillPythonPath() {
"just \"python.exe\"");
python_path = "python.exe";
}
- build_settings_.set_python_path(
- base::FilePath(base::UTF8ToUTF16(python_path)));
+ build_settings_.set_python_path(base::FilePath(base::UTF8ToUTF16(python_path))
+ .NormalizePathSeparatorsTo('/'));
#else
build_settings_.set_python_path(base::FilePath("python"));
#endif
« no previous file with comments | « tools/gn/ninja_toolchain_writer.cc ('k') | tools/gn/source_dir.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698