JDBtracker
/
OctaBuild
forked from OctaForge/OctaBuild
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaner --change-directory

master
Daniel Kolesa 2017-05-25 00:04:10 +02:00
parent 48155c3df7
commit 04119652de
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.cc
View File

@ -601,10 +601,7 @@ int main(int argc, char **argv) {
ap.add_optional("-C", "--change-directory", 1)
.help("change to DIRECTORY before running")
.metavar("DIRECTORY")
.action([&curdir, &os](auto vals) {
curdir = std::string{vals[0]};
fs::current_path(curdir);
});
.action(ostd::arg_store_str(curdir));
std::string deffile = "obuild.cfg";
ap.add_optional("-f", "--file", 1)
@ -632,10 +629,6 @@ int main(int argc, char **argv) {
ostd::cerr.writefln("failed parsing arguments: %s", e.what());
ap.print_help(ostd::cerr.iter());
return 1;
} catch (fs::filesystem_error const &e) {
return os.error(
1, "failed changing directory: %s (%s)", curdir, e.what()
);
}
if (help.used()) {
@ -647,6 +640,16 @@ int main(int argc, char **argv) {
}
jobs = std::max(1, jobs);
try {
if (!curdir.empty()) {
fs::current_path(curdir);
}
} catch (fs::filesystem_error const &e) {
return os.error(
1, "failed changing directory: %s (%s)", curdir, e.what()
);
}
os.new_ivar("numjobs", 4096, 1, jobs);
ostd::thread_pool tpool;