mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-25 03:19:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

make options to be experimental.

Browse Source
This commit is contained in:
Sean Yen 2019-06-19 16:25:21 -07:00
parent 4c7188919a
commit f54151fff6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/src/vcpkg/export.chocolatey.cpp
View File

@ -150,6 +150,8 @@ if (Test-Path $installedDir)
const VcpkgPaths& paths, const VcpkgPaths& paths,
const Options& chocolatey_options) const Options& chocolatey_options)
{ {
Checks::check_exit(VCPKG_LINE_INFO, chocolatey_options.maybe_maintainer.has_value(), "--x-maintainer option is required.");
Files::Filesystem& fs = paths.get_filesystem(); Files::Filesystem& fs = paths.get_filesystem();
const fs::path vcpkg_root_path = paths.root; const fs::path vcpkg_root_path = paths.root;
const fs::path raw_exported_dir_path = vcpkg_root_path / "chocolatey"; const fs::path raw_exported_dir_path = vcpkg_root_path / "chocolatey";

12
toolsrc/src/vcpkg/export.cpp
View File

@ -283,9 +283,9 @@ namespace vcpkg::Export
static constexpr StringLiteral OPTION_IFW_REPOSITORY_DIR_PATH = "--ifw-repository-directory-path"; static constexpr StringLiteral OPTION_IFW_REPOSITORY_DIR_PATH = "--ifw-repository-directory-path";
static constexpr StringLiteral OPTION_IFW_CONFIG_FILE_PATH = "--ifw-configuration-file-path"; static constexpr StringLiteral OPTION_IFW_CONFIG_FILE_PATH = "--ifw-configuration-file-path";
static constexpr StringLiteral OPTION_IFW_INSTALLER_FILE_PATH = "--ifw-installer-file-path"; static constexpr StringLiteral OPTION_IFW_INSTALLER_FILE_PATH = "--ifw-installer-file-path";
static constexpr StringLiteral OPTION_CHOCOLATEY = "--chocolatey"; static constexpr StringLiteral OPTION_CHOCOLATEY = "--x-chocolatey";
static constexpr StringLiteral OPTION_CHOCOLATEY_MAINTAINER = "--maintainer"; static constexpr StringLiteral OPTION_CHOCOLATEY_MAINTAINER = "--x-maintainer";
static constexpr StringLiteral OPTION_CHOCOLATEY_VERSION_SUFFIX = "--version-suffix"; static constexpr StringLiteral OPTION_CHOCOLATEY_VERSION_SUFFIX = "--x-version-suffix";
static constexpr std::array<CommandSwitch, 7> EXPORT_SWITCHES = {{ static constexpr std::array<CommandSwitch, 7> EXPORT_SWITCHES = {{
{OPTION_DRY_RUN, "Do not actually export"}, {OPTION_DRY_RUN, "Do not actually export"},
@ -294,7 +294,7 @@ namespace vcpkg::Export
{OPTION_IFW, "Export to an IFW-based installer"}, {OPTION_IFW, "Export to an IFW-based installer"},
{OPTION_ZIP, "Export to a zip file"}, {OPTION_ZIP, "Export to a zip file"},
{OPTION_SEVEN_ZIP, "Export to a 7zip (.7z) file"}, {OPTION_SEVEN_ZIP, "Export to a 7zip (.7z) file"},
{OPTION_CHOCOLATEY, "Export a Chocolatey package"}, {OPTION_CHOCOLATEY, "Export a Chocolatey package (experimental feature)"},
}}; }};
static constexpr std::array<CommandSetting, 10> EXPORT_SETTINGS = {{ static constexpr std::array<CommandSetting, 10> EXPORT_SETTINGS = {{
@ -306,8 +306,8 @@ namespace vcpkg::Export
{OPTION_IFW_REPOSITORY_DIR_PATH, "Specify the directory path for the exported repository"}, {OPTION_IFW_REPOSITORY_DIR_PATH, "Specify the directory path for the exported repository"},
{OPTION_IFW_CONFIG_FILE_PATH, "Specify the temporary file path for the installer configuration"}, {OPTION_IFW_CONFIG_FILE_PATH, "Specify the temporary file path for the installer configuration"},
{OPTION_IFW_INSTALLER_FILE_PATH, "Specify the file path for the exported installer"}, {OPTION_IFW_INSTALLER_FILE_PATH, "Specify the file path for the exported installer"},
{OPTION_CHOCOLATEY_MAINTAINER, "Specify the maintainer for the exported Chocolatey package"}, {OPTION_CHOCOLATEY_MAINTAINER, "Specify the maintainer for the exported Chocolatey package (experimental feature)"},
{OPTION_CHOCOLATEY_VERSION_SUFFIX, "Specify the version suffix to add for the exported Chocolatey package"}, {OPTION_CHOCOLATEY_VERSION_SUFFIX, "Specify the version suffix to add for the exported Chocolatey package (experimental feature)"},
}}; }};
const CommandStructure COMMAND_STRUCTURE = { const CommandStructure COMMAND_STRUCTURE = {