Remove some usages of SW_BINARY_DIR.

egorpugin · egorpugin · commit 4dc1532e7874 · 2020-01-03T22:13:05.000+03:00
diff --git a/src/sw/client/cli/command/build.cpp b/src/sw/client/cli/command/build.cpp
@@ -33,8 +33,8 @@ extern ::cl::opt<bool> build_after_fetch;
 
 static ::cl::list<String> build_arg(::cl::Positional, ::cl::desc("Files or directories to build (paths to config)"), ::cl::sub(subcommand_build));
 
-static ::cl::opt<String> build_source_dir("S", ::cl::desc("Explicitly specify a source directory."), ::cl::sub(subcommand_build), ::cl::init("."));
-static ::cl::opt<String> build_binary_dir("B", ::cl::desc("Explicitly specify a build directory."), ::cl::sub(subcommand_build), ::cl::init(SW_BINARY_DIR));
+//static ::cl::opt<String> build_source_dir("S", ::cl::desc("Explicitly specify a source directory."), ::cl::sub(subcommand_build), ::cl::init("."));
+//static ::cl::opt<String> build_binary_dir("B", ::cl::desc("Explicitly specify a build directory."), ::cl::sub(subcommand_build), ::cl::init(SW_BINARY_DIR));
 
 static ::cl::opt<bool> build_fetch("fetch", ::cl::desc("Fetch sources, then build"), ::cl::sub(subcommand_build));
 static ::cl::opt<path> build_explan("ef", ::cl::desc("Build execution plan from specified file"), ::cl::sub(subcommand_build));
@@ -606,7 +606,7 @@ static void isolated_build1(sw::SwContext &swctx)
     LOG_INFO(logger, "Copying files");
 
     auto m = getPackages(b, srcs);
-    auto d = fs::current_path() / SW_BINARY_DIR / "isolated";
+    auto d = b.getBuildDirectory() / "isolated";
 
     for (const auto &[pkg, tgts] : b.getTargetsToBuild())
     {
diff --git a/src/sw/client/cli/command/fetch.cpp b/src/sw/client/cli/command/fetch.cpp
@@ -54,7 +54,7 @@ static sw::SourceDirMap getSources(sw::SwContext &swctx)
     b.loadInputs();
     b.setTargetsToBuild();
 
-    auto d = fs::current_path() / SW_BINARY_DIR / "src";
+    auto d = b.getBuildDirectory() / "src";
 
     sw::SourceDirMap srcs;
     std::unordered_set<sw::SourcePtr> sources;
@@ -73,7 +73,7 @@ static sw::SourceDirMap getSources(sw::SwContext &swctx)
     }
 
     sw::SourceDownloadOptions opts;
-    opts.root_dir = fs::current_path() / SW_BINARY_DIR;
+    opts.root_dir = b.getBuildDirectory();
     opts.ignore_existing_dirs = true;
     opts.existing_dirs_age = std::chrono::hours(1);
 
diff --git a/src/sw/client/cli/command/upload.cpp b/src/sw/client/cli/command/upload.cpp
@@ -131,7 +131,7 @@ SUBCOMMAND_DECL2(upload)
     // dbg purposes
     for (auto &[id, d] : m)
     {
-        write_file(fs::current_path() / SW_BINARY_DIR / "upload" / id.toString() += ".json", d->getString());
+        write_file(b->getBuildDirectory() / "upload" / id.toString() += ".json", d->getString());
         auto id2 = sw::PackageId(sw::PackagePath(upload_prefix) / id.getPath(), id.getVersion());
         LOG_INFO(logger, "Uploading " + id2.toString());
     }
diff --git a/src/sw/client/cli/generator/generator.cpp b/src/sw/client/cli/generator/generator.cpp
@@ -253,7 +253,7 @@ std::unique_ptr<Generator> Generator::create(const String &s)
 
 path Generator::getRootDirectory(const sw::SwBuild &b) const
 {
-    return fs::current_path() / path(SW_BINARY_DIR) / "g" / getPathString() / b.getHash();
+    return b.getBuildDirectory() / "g" / getPathString() / b.getHash();
 }
 
 path Generator::getPathString() const
diff --git a/src/sw/driver/entry_point.cpp b/src/sw/driver/entry_point.cpp
@@ -495,7 +495,7 @@ void PrepareConfigEntryPoint::many2one(Build &b, const std::unordered_set<LocalP
         if (is_under_root(fn, b.getContext().getLocalStorage().storage_dir_pkg))
             h = fn.parent_path().parent_path() / "auxl" / ("defs" + hash + ".h");
         else
-            h = fn.parent_path() / SW_BINARY_DIR / "auxl" / ("defs" + hash + ".h");
+            h = b.getMainBuild().getBuildDirectory() / "auxl" / ("defs" + hash + ".h");
         primitives::CppEmitter ctx;
 
         ctx.addLine("#define configure configure" + hash);

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ SUBCOMMAND_DECL2(upload)`
`131`	`131`	`// dbg purposes`
`132`	`132`	`for (auto &[id, d] : m)`
`133`	`133`	`{`
`134`		`- write_file(fs::current_path() / SW_BINARY_DIR / "upload" / id.toString() += ".json", d->getString());`
	`134`	`+ write_file(b->getBuildDirectory() / "upload" / id.toString() += ".json", d->getString());`
`135`	`135`	`auto id2 = sw::PackageId(sw::PackagePath(upload_prefix) / id.getPath(), id.getVersion());`
`136`	`136`	`LOG_INFO(logger, "Uploading " + id2.toString());`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ std::unique_ptr<Generator> Generator::create(const String &s)`
`253`	`253`
`254`	`254`	`path Generator::getRootDirectory(const sw::SwBuild &b) const`
`255`	`255`	`{`
`256`		`- return fs::current_path() / path(SW_BINARY_DIR) / "g" / getPathString() / b.getHash();`
	`256`	`+ return b.getBuildDirectory() / "g" / getPathString() / b.getHash();`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`path Generator::getPathString() const`