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

start moving funcs into ObState

master
Daniel Kolesa 2015-08-20 12:59:15 -07:00
parent dd8c6fe17a
commit 349e9b7851
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.cc
View File

@ -21,6 +21,13 @@ struct Rule {
struct ObState {
cscript::CsState cs;
ostd::ConstCharRange progname;
template<typename ...A>
int error(int retcode, ostd::ConstCharRange fmt, A &&...args) {
ostd::err.write(progname, ": ");
ostd::err.writefln(fmt, ostd::forward<A>(args)...);
return retcode;
}
};
ostd::Vector<Rule> rules;
@ -56,14 +63,6 @@ static bool ob_check_exec(ostd::ConstCharRange tname,
return ob_check_ts(tname, deps);
}
template<typename ...A>
static int ob_error(ObState &os, int retcode, ostd::ConstCharRange fmt,
A &&...args) {
ostd::err.write(os.progname, ": ");
ostd::err.writefln(fmt, ostd::forward<A>(args)...);
return retcode;
}
static int ob_exec_rule(ObState &os, ostd::ConstCharRange target,
ostd::ConstCharRange from = ostd::ConstCharRange());
@ -107,7 +106,7 @@ static int ob_exec_func(ObState &os, ostd::ConstCharRange tname,
if (!r.func)
continue;
if (func)
return ob_error(os, 1, "redefinition of rule '%s'", tname);
return os.error(1, "redefinition of rule '%s'", tname);
func = r.func;
}
if (func) {
@ -190,10 +189,9 @@ static int ob_exec_rule(ObState &os, ostd::ConstCharRange target,
}
if (rlist.empty() && !ob_check_file(target)) {
if (from.empty())
return ob_error(os, 1, "no rule to run target '%s'", target);
return os.error(1, "no rule to run target '%s'", target);
else
return ob_error(os, 1, "no rule to run target '%s' "
"(needed by '%s')",
return os.error(1, "no rule to run target '%s' (needed by '%s')",
target, from);
return 1;
}
@ -239,10 +237,10 @@ int main(int argc, char **argv) {
os.cs.add_command("rule", "sseN", ob_rule_cmd);
if (!os.cs.run_file("cubefile", true))
return ob_error(os, 1, "failed creating rules");
return os.error(1, "failed creating rules");
if (rules.empty())
return ob_error(os, 1, "no targets");
return os.error(1, "no targets");
return ob_exec_rule(os, (argc > 1) ? argv[1] : "all");
}