Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

integrate project: add option to set the nuget package name #111

Closed
wants to merge 1 commit into from
Closed

integrate project: add option to set the nuget package name #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions src/vcpkg/commands.integrate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ CMake projects should use: "-DCMAKE_TOOLCHAIN_FILE=%s"
}

#if defined(WIN32)
static void integrate_project(const VcpkgPaths& paths)
static void integrate_project(const VcpkgPaths& paths, const Optional<std::string>& nuget_package_name)
{
auto& fs = paths.get_filesystem();

Expand All @@ -366,7 +366,7 @@ CMake projects should use: "-DCMAKE_TOOLCHAIN_FILE=%s"
const path targets_file_path = tmp_dir / "vcpkg.nuget.targets";
const path props_file_path = tmp_dir / "vcpkg.nuget.props";
const path nuspec_file_path = tmp_dir / "vcpkg.nuget.nuspec";
const std::string nuget_id = get_nuget_id(paths.root);
const std::string nuget_id = nuget_package_name.value_or(get_nuget_id(paths.root));
const std::string nupkg_version = "1.0.0";

fs.write_contents(
Expand Down Expand Up @@ -557,18 +557,38 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
};
}

static constexpr StringLiteral OPTION_NUGUT_PACKAGE_NAME = "nuget-package-name";

const CommandSetting COMMAND_SETTINGS[] = {
{OPTION_NUGUT_PACKAGE_NAME, "Sets the name for the generated nuget package (`integrate project`)"},
};

const CommandStructure COMMAND_STRUCTURE = {
"Commands:\n" + get_helpstring(),
1,
1,
{},
{{}, COMMAND_SETTINGS, {}},
&valid_arguments,
};

void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
{
(void)args.parse_arguments(COMMAND_STRUCTURE);

const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE);
const auto nuget_package_name = [&]() -> Optional<std::string> {
const auto iter = options.settings.find(OPTION_NUGUT_PACKAGE_NAME);
return iter == options.settings.end() ? nullopt : Optional<std::string>(iter->second);
}();

if (nuget_package_name.has_value() && args.command_arguments[0] != Subcommand::PROJECT)
{
print2(Color::error,
"Error: The option %s is only available when using the subcommand %s\n",
OPTION_NUGUT_PACKAGE_NAME,
Subcommand::PROJECT);
Checks::exit_fail(VCPKG_LINE_INFO);
}
if (args.command_arguments[0] == Subcommand::INSTALL)
{
return integrate_install(paths);
Expand All @@ -580,7 +600,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
#if defined(_WIN32)
if (args.command_arguments[0] == Subcommand::PROJECT)
{
return integrate_project(paths);
return integrate_project(paths, std::move(nuget_package_name));
}
if (args.command_arguments[0] == Subcommand::POWERSHELL)
{
Expand Down