disabled prebuilts for now

fixed unknown options being interpreted as task names
This commit is contained in:
isanae
2020-05-06 03:51:27 -04:00
parent d973a9f02d
commit 75af85e5a0
4 changed files with 11 additions and 10 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ static path_map g_tools =
static bool_map g_prebuilt =
{
{"boost", false}
//{"boost", false}
};
static string_map g_versions =
+1 -1
View File
@@ -59,7 +59,7 @@ struct prebuilt
{
static bool by_name(const std::string& s);
VALUE(boost);
//VALUE(boost);
};
struct versions
+3 -2
View File
@@ -43,7 +43,7 @@ std::optional<int> handle_command_line(int argc, char** argv)
clipp::group g;
g.push_back(
(clipp::option("--version") >> cmd.version)
(clipp::option("-v", "--version") >> cmd.version)
% "shows the version",
(clipp::option("-h", "--help") >> cmd.help)
@@ -85,7 +85,8 @@ std::optional<int> handle_command_line(int argc, char** argv)
% "sets an option, such as 'versions/openssl=1.2'; -s with no "
"arguments lists the available options",
(clipp::opt_values("task", g_tasks_to_run))
(clipp::opt_values(
clipp::match::prefix_not("-"), "task", g_tasks_to_run))
% "tasks to run"
);
+6 -6
View File
@@ -16,17 +16,17 @@ fs::path boost::source_path()
void boost::do_fetch()
{
if (prebuilt::boost())
fetch_prebuilt();
else
//if (prebuilt::boost())
// fetch_prebuilt();
//else
fetch_from_source();
}
void boost::do_build_and_install()
{
if (prebuilt::boost())
build_and_install_prebuilt();
else
//if (prebuilt::boost())
// build_and_install_prebuilt();
//else
build_and_install_from_source();
}