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

Unified Diff: tools/gn/setup.h

Issue 165823003: GN: Change gen command syntax, support relative dirs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments fixes Created 6 years, 10 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_build_writer.cc ('k') | tools/gn/setup.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/setup.h
diff --git a/tools/gn/setup.h b/tools/gn/setup.h
index 56e6cad028d4d073a524ef5ac4f7785af7017116..4d8d29baa16e330b731615d45b83b67ad8d3dfd6 100644
--- a/tools/gn/setup.h
+++ b/tools/gn/setup.h
@@ -78,7 +78,11 @@ class Setup : public CommonSetup {
// Configures the build for the current command line. On success returns
// true. On failure, prints the error and returns false.
- bool DoSetup();
+ //
+ // The parameter is the string the user specified for the build directory. We
+ // will try to interpret this as a SourceDir if possible, and will fail if is
+ // is malformed.
+ bool DoSetup(const std::string& build_dir);
// Runs the load, returning true on success. On failure, prints the error
// and returns false. This includes both RunPreMessageLoop() and
@@ -96,6 +100,11 @@ class Setup : public CommonSetup {
// Fills the root directory into the settings. Returns true on success.
bool FillSourceDir(const CommandLine& cmdline);
+ // Fills the build directory given the value the user has specified.
+ // Must happen after FillSourceDir so we can resolve source-relative
+ // paths.
+ bool FillBuildDir(const std::string& build_dir);
+
// Fills the python path portion of the command line. On failure, sets
// it to just "python".
void FillPythonPath();
« no previous file with comments | « tools/gn/ninja_build_writer.cc ('k') | tools/gn/setup.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698