microsoft
/
vcpkg
зеркало из https://github.com/microsoft/vcpkg.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix `vcpkg create` to not parse all arguments as package specs

This commit is contained in:
Alexander Karatarakis 2016-09-23 17:07:01 -07:00
Родитель 6cc29c1f84
Коммит c7a7d062a7
1 изменённых файлов: 25 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

40
toolsrc/src/commands_create.cpp
Просмотреть файл

@ -7,29 +7,39 @@ namespace vcpkg
void create_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet)
{
args.check_max_args(3);
package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet).at(0);
if (args.command_arguments.size() < 2)
{
System::println(System::color::error, "Error: create requires the archive's URL as the second argument.");
print_usage();
exit(EXIT_FAILURE);
}
Environment::ensure_utilities_on_path(paths);
// Space OR define the FILENAME with proper spacing
std::wstring custom_filename = L" ";
if (args.command_arguments.size() >= 3)
expected<package_spec> current_spec = package_spec::from_string(args.command_arguments[0], default_target_triplet);
if (const package_spec* spec = current_spec.get())
{
custom_filename = Strings::format(L" -DFILENAME=%s ", Strings::utf8_to_utf16(args.command_arguments.at(2)));
Environment::ensure_utilities_on_path(paths);
// Space OR define the FILENAME with proper spacing
std::wstring custom_filename = L" ";
if (args.command_arguments.size() >= 3)
{
custom_filename = Strings::format(LR"( -DFILENAME="%s" )", Strings::utf8_to_utf16(args.command_arguments.at(2)));
}
const std::wstring cmdline = Strings::format(LR"(cmake -DCMD=SCAFFOLD -DPORT=%s -DTARGET_TRIPLET=%s -DURL=%s%s-P "%s")",
Strings::utf8_to_utf16(spec->name),
Strings::utf8_to_utf16(spec->target_triplet.value),
Strings::utf8_to_utf16(args.command_arguments.at(1)),
custom_filename,
paths.ports_cmake.generic_wstring());
exit(System::cmd_execute(cmdline));
}
else
{
System::println(System::color::error, "Error: %s: %s", current_spec.error_code().message(), args.command_arguments[0]);
print_example(Strings::format("%s zlib:x64-windows", args.command).c_str());
exit(EXIT_FAILURE);
}
const std::wstring cmdline = Strings::format(LR"(cmake -DCMD=SCAFFOLD -DPORT=%s -DTARGET_TRIPLET=%s -DURL=%s%s-P "%s")",
Strings::utf8_to_utf16(spec.name),
Strings::utf8_to_utf16(spec.target_triplet.value),
Strings::utf8_to_utf16(args.command_arguments.at(1)),
custom_filename,
paths.ports_cmake.generic_wstring());
exit(System::cmd_execute(cmdline));
}
}