diff options
author | 2010-11-11 19:12:57 +0000 | |
---|---|---|
committer | 2010-11-11 19:12:57 +0000 | |
commit | c14b11bc5850fe1c7a02c72217e692f4f668a253 (patch) | |
tree | 0156f1168d13b14146d461a8b3bb276bb6932693 | |
parent | 9f0576b4b2309e1c94e8be2a71f5d7f1d4f94023 (diff) | |
download | paludis-c14b11bc5850fe1c7a02c72217e692f4f668a253.tar.gz paludis-c14b11bc5850fe1c7a02c72217e692f4f668a253.tar.xz |
Always show pbin command line options
-rw-r--r-- | src/clients/cave/cmd_resolve_cmdline.cc | 9 | ||||
-rw-r--r-- | src/clients/cave/cmd_resolve_cmdline.hh | 2 | ||||
-rw-r--r-- | src/clients/cave/resolve_common.cc | 2 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc index 8735c4f30..d73161fbe 100644 --- a/src/clients/cave/cmd_resolve_cmdline.cc +++ b/src/clients/cave/cmd_resolve_cmdline.cc @@ -234,31 +234,22 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A args::EnumArg::EnumArgOptions ("auto", 'a', "'install', or 'chroot' if the preferred root is not /") ("install", 'i', "Install targets to /") -#ifdef ENABLE_PBINS ("binaries", 'b', "Create binary packages for targets") -#endif ("chroot", 'c', "Install targets to a chroot"), "auto"), a_make_dependencies(&g_destination_options, "make-dependencies", 'M', "Specify what to do with dependencies of " "targets. Only useful when '--make' is not set to 'install', since dependencies on / are considered " "specially.", args::EnumArg::EnumArgOptions -#ifdef ENABLE_PBINS ("auto", '\0', "Select appropriate behaviour based upon --make. For 'install', 'all', and " "for 'binaries' and 'chroot', 'runtime'.") -#else - ("auto", '\0', "Select appropriate behaviour based upon --make. For 'install', 'all', and " - "for 'chroot', 'runtime'.") -#endif ("runtime", 'r', "Only care about runtime dependencies") ("all", 'a', "Care about all dependencies") ("none", 'n', "Don't care about dependencies at all"), "auto"), -#ifdef ENABLE_PBINS a_via_binary(&g_destination_options, "via-binary", 'b', "When building a package matching the supplied spec, " "create a binary package and use that for the install. May be specified multiple times. If this option " "is not specified, a package will be built multiple times for multiple destinations"), -#endif a_dependencies_to_slash(&g_destination_options, "dependencies-to-slash", '/', "Specify what to do with " "dependencies for the / filesystem when not working on /. By default, all dependencies are installed " "to /.", diff --git a/src/clients/cave/cmd_resolve_cmdline.hh b/src/clients/cave/cmd_resolve_cmdline.hh index aa6e76f81..67d0663ab 100644 --- a/src/clients/cave/cmd_resolve_cmdline.hh +++ b/src/clients/cave/cmd_resolve_cmdline.hh @@ -96,9 +96,7 @@ namespace paludis args::ArgsGroup g_destination_options; args::EnumArg a_make; args::EnumArg a_make_dependencies; -#ifdef ENABLE_PBINS args::StringSetArg a_via_binary; -#endif args::EnumArg a_dependencies_to_slash; // args::ArgsGroup g_query_options; diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc index 89826c85e..2eb7c6431 100644 --- a/src/clients/cave/resolve_common.cc +++ b/src/clients/cave/resolve_common.cc @@ -682,12 +682,10 @@ paludis::cave::resolve_common( allowed_to_remove_helper.add_allowed_to_remove_spec(parse_user_package_dep_spec(*i, env.get(), { updso_allow_wildcards })); AlwaysViaBinaryHelper always_via_binary_helper(env.get()); -#ifdef ENABLE_PBINS for (args::StringSetArg::ConstIterator i(resolution_options.a_via_binary.begin_args()), i_end(resolution_options.a_via_binary.end_args()) ; i != i_end ; ++i) always_via_binary_helper.add_always_via_binary_spec(parse_user_package_dep_spec(*i, env.get(), { updso_allow_wildcards })); -#endif CanUseHelper can_use_helper(env.get()); for (args::StringSetArg::ConstIterator i(resolution_options.a_not_usable.begin_args()), |