[Localization] Help Text for Command Switches

include/vcpkg/vcpkgcmdarguments.h

@@ -28,35 +28,20 @@ namespace vcpkg
 
     struct CommandSwitch
     {
-        constexpr CommandSwitch(const StringLiteral& name, const StringLiteral& short_help_text)
-            : name(name), short_help_text(short_help_text)
-        {
-        }
-
         StringLiteral name;
-        StringLiteral short_help_text;
+        LocalizedString (*helpmsg)();
     };
 
     struct CommandSetting
     {
-        constexpr CommandSetting(const StringLiteral& name, const StringLiteral& short_help_text)
-            : name(name), short_help_text(short_help_text)
-        {
-        }
-
         StringLiteral name;
-        StringLiteral short_help_text;
+        LocalizedString (*helpmsg)();
     };
 
     struct CommandMultiSetting
     {
-        constexpr CommandMultiSetting(const StringLiteral& name, const StringLiteral& short_help_text)
-            : name(name), short_help_text(short_help_text)
-        {
-        }
-
         StringLiteral name;
-        StringLiteral short_help_text;
+        LocalizedString (*helpmsg)();
     };
 
     struct CommandOptionsStructure

locales/messages.json

@@ -142,6 +142,22 @@
   "_BuildingPackageFailedDueToMissingDeps.comment": "Printed after BuildingPackageFailed, and followed by a list of dependencies that were missing.",
   "BuiltInTriplets": "vcpkg built-in triplets:",
   "BuiltWithIncorrectArchitecture": "The following files were built for an incorrect architecture:",
+  "CISettingsExclude": "Comma-separated list of ports to skip",
+  "CISettingsOptCIBase": "Path to the ci.baseline.txt file. Used to skip ports and detect regressions.",
+  "CISettingsOptExclude": "Comma separated list of ports to skip",
+  "CISettingsOptFailureLogs": "Directory to which failure logs will be copied",
+  "CISettingsOptHostExclude": "Comma separated list of ports to skip for the host triplet",
+  "CISettingsOptOutputHashes": "File to output all determined package hashes",
+  "CISettingsOptParentHashes": "File to read package hashes for a parent CI state, to reduce the set of changed packages",
+  "CISettingsOptSkippedCascadeCount": "Asserts that the number of --exclude and supports skips exactly equal this number",
+  "CISettingsOptXUnit": "File to output results in XUnit format (internal)",
+  "CISettingsVerifyGitTree": "Verify that each git tree object matches its declared version (this is very slow)",
+  "CISettingsVerifyVersion": "Print result for each port instead of just errors.",
+  "CISwitchOptAllowUnexpectedPassing": "Indicates that 'Passing, remove from fail list' results should not be emitted.",
+  "CISwitchOptDryRun": "Print out plan without execution",
+  "CISwitchOptRandomize": "Randomize the install order",
+  "CISwitchOptSkipFailures": "Indicates that ports marked `=fail` in ci.baseline.txt should be skipped.",
+  "CISwitchOptXUnitAll": "Report also unchanged ports to the XUnit output (internal)",
   "CMakeTargetsUsage": "{package_name} provides CMake targets:",
   "_CMakeTargetsUsage.comment": "'targets' are a CMake and Makefile concept An example of {package_name} is zlib.",
   "CMakeTargetsUsageHeuristicMessage": "# this is heuristically generated, and may not be correct",
@@ -166,6 +182,82 @@
   "_ClearingContents.comment": "An example of {path} is /foo/bar.",
   "CmakeTargetsExcluded": "note: {count} additional targets are not displayed.",
   "_CmakeTargetsExcluded.comment": "An example of {count} is 42.",
+  "CmdAddVersionOptAll": "Process versions for all ports.",
+  "CmdAddVersionOptOverwriteVersion": "Overwrite `git-tree` of an existing version.",
+  "CmdAddVersionOptSkipFormatChk": "Skips the formatting check of vcpkg.json files.",
+  "CmdAddVersionOptSkipVersionFormatChk": "Skips the version format check.",
+  "CmdAddVersionOptVerbose": "Print success messages instead of just errors.",
+  "CmdContactOptSurvey": "Launch default browser to the current vcpkg survey",
+  "CmdDependInfoOptDGML": "Creates graph on basis of dgml",
+  "CmdDependInfoOptDepth": "Show recursion depth in output",
+  "CmdDependInfoOptDot": "Creates graph on basis of dot",
+  "CmdDependInfoOptMaxRecurse": "Set max recursion depth, a value of -1 indicates no limit",
+  "CmdDependInfoOptSort": "Set sort order for the list of dependencies, accepted values are: lexicographical, topological (default), x-tree, reverse",
+  "CmdEditOptAll": "Open editor into the port as well as the port-specific buildtree subfolder",
+  "CmdEditOptBuildTrees": "Open editor into the port-specific buildtree subfolder",
+  "CmdEnvOptions": "Add installed {path} to {env_var}",
+  "_CmdEnvOptions.comment": "An example of {path} is /foo/bar. An example of {env_var} is VCPKG_DEFAULT_TRIPLET.",
+  "CmdExportOpt7Zip": "Export to a 7zip (.7z) file",
+  "CmdExportOptChocolatey": "Export a Chocolatey package (experimental feature)",
+  "CmdExportOptDebug": "Enable prefab debug",
+  "CmdExportOptDryRun": "Do not actually export.",
+  "CmdExportOptIFW": "Export to an IFW-based installer",
+  "CmdExportOptInstalled": "Export all installed packages",
+  "CmdExportOptMaven": "Enable Maven",
+  "CmdExportOptNuget": "Export a NuGet package",
+  "CmdExportOptPrefab": "Export to Prefab format",
+  "CmdExportOptRaw": "Export to an uncompressed directory",
+  "CmdExportOptZip": "Export to a zip file",
+  "CmdExportSettingChocolateyMaint": "Specify the maintainer for the exported Chocolatey package (experimental feature)",
+  "CmdExportSettingChocolateyVersion": "Specify the version suffix to add for the exported Chocolatey package (experimental feature)",
+  "CmdExportSettingConfigFile": "Specify the temporary file path for the installer configuration",
+  "CmdExportSettingInstallerPath": "Specify the file path for the exported installer",
+  "CmdExportSettingNugetDesc": "Specify a description for the exported NuGet package",
+  "CmdExportSettingNugetID": "Specify the id for the exported NuGet package (overrides --output)",
+  "CmdExportSettingNugetVersion": "Specify the version for the exported NuGet package",
+  "CmdExportSettingOutput": "Specify the output name (used to construct filename)",
+  "CmdExportSettingOutputDir": "Specify the output directory for produced artifacts",
+  "CmdExportSettingPkgDir": "Specify the temporary directory path for the repacked packages",
+  "CmdExportSettingPrefabArtifactID": "Artifact Id is the name of the project according Maven specifications",
+  "CmdExportSettingPrefabGroupID": "GroupId uniquely identifies your project according Maven specifications",
+  "CmdExportSettingPrefabVersion": "Version is the name of the project according Maven specifications",
+  "CmdExportSettingRepoDir": "Specify the directory path for the exported repository",
+  "CmdExportSettingRepoURL": "Specify the remote repository URL for the online installer",
+  "CmdExportSettingSDKMinVersion": "Android minimum supported SDK version",
+  "CmdExportSettingSDKTargetVersion": "Android target sdk version",
+  "CmdFetchOptXStderrStatus": "Direct status/downloading messages to stderr rather than stdout. (Errors/failures still go to stdout)",
+  "CmdFormatManifestOptAll": "Format all ports' manifest files.",
+  "CmdFormatManifestOptConvertControl": "Convert CONTROL files to manifest files.",
+  "CmdGenerateMessageMapOptNoOutputComments": "When generating the message map, exclude comments (useful for generating the English localization file)",
+  "CmdGenerateMessageMapOptOutputComments": "When generating the message map, include comments (the default)",
+  "CmdInfoOptInstalled": "(experimental) Report on installed packages instead of available",
+  "CmdInfoOptTransitive": "(experimental) Also report on dependencies of installed packages",
+  "CmdNewOptApplication": "Create an application manifest (don't require name or version).",
+  "CmdNewOptSingleFile": "Embed vcpkg-configuration.json into vcpkg.json.",
+  "CmdNewOptVersionDate": "Interpret --version as an ISO 8601 date. (YYYY-MM-DD)",
+  "CmdNewOptVersionRelaxed": "Interpret --version as a relaxed-numeric version. (Nonnegative numbers separated by dots)",
+  "CmdNewOptVersionString": "Interpret --version as a string with no ordering behavior.",
+  "CmdNewSettingName": "Name for the new manifest.",
+  "CmdNewSettingVersion": "Version for the new manifest.",
+  "CmdRegenerateOptDryRun": "does not actually perform the action, shows only what would be done",
+  "CmdRegenerateOptForce": "proceeds with the (potentially dangerous) action without confirmation",
+  "CmdRegenerateOptNormalize": "apply any deprecation fixups",
+  "CmdRemoveOptDryRun": "Print the packages to be removed, but do not remove them",
+  "CmdRemoveOptOutdated": "Select all packages with versions that do not match the portfiles",
+  "CmdRemoveOptRecurse": "Allow removal of packages not explicitly specified on the command line",
+  "CmdSetInstalledOptDryRun": "Do not actually build or install",
+  "CmdSetInstalledOptNoUsage": "Don't print CMake usage information after install.",
+  "CmdSetInstalledOptWritePkgConfig": "Writes out a NuGet packages.config-formatted file for use with external binary caching.\nSee `vcpkg help binarycaching` for more information.",
+  "CmdUpdateBaselineOptDryRun": "Print out plan without execution",
+  "CmdUpdateBaselineOptInitial": "add a `builtin-baseline` to a vcpkg.json that doesn't already have it",
+  "CmdUpgradeOptAllowUnsupported": "Instead of erroring on an unsupported port, continue with a warning.",
+  "CmdUpgradeOptNoDryRun": "Actually upgrade",
+  "CmdUpgradeOptNoKeepGoing": "Stop installing packages on failure",
+  "CmdXDownloadOptHeader": "Additional header to use when fetching from URLs",
+  "CmdXDownloadOptSha": "The hash of the file to be downloaded",
+  "CmdXDownloadOptSkipSha": "Do not check the SHA512 of the downloaded file",
+  "CmdXDownloadOptStore": "Indicates the file should be stored instead of fetched",
+  "CmdXDownloadOptUrl": "URL to download and store if missing from cache",
   "CommandFailed": "command:\n{command_line}\nfailed with the following results:",
   "_CommandFailed.comment": "An example of {command_line} is vcpkg install zlib.",
   "CommunityTriplets": "VCPKG community triplets:",
@@ -486,8 +578,28 @@
   "HelpRemoveOutdatedCommand": "Uninstall all out-of-date packages.",
   "HelpResponseFileCommand": "Specify a response file to provide additional parameters.",
   "HelpSearchCommand": "Search for packages available to be built.",
+  "HelpTextOptFullDesc": "Do not truncate long text",
   "HelpTopicCommand": "Display help for a specific topic.",
   "HelpTopicsCommand": "Display the list of help topics.",
+  "HelpTxtOptAllowUnsupportedPort": "Instead of erroring on an unsupported port, continue with a warning.",
+  "HelpTxtOptCleanAfterBuild": "Clean buildtrees, packages and downloads after building each package",
+  "HelpTxtOptCleanBuildTreesAfterBuild": "Clean buildtrees after building each package",
+  "HelpTxtOptCleanDownloadsAfterBuild": "Clean downloads after building each package",
+  "HelpTxtOptCleanPkgAfterBuild": "Clean packages after building each package",
+  "HelpTxtOptDryRun": "Do not actually build or install.",
+  "HelpTxtOptEditable": "Disable source re-extraction and binary caching for libraries on the command line (classic mode)",
+  "HelpTxtOptEnforcePortChecks": "Fail install if a port has detected problems or attempts to use a deprecated feature",
+  "HelpTxtOptKeepGoing": "Continue installing packages on failure",
+  "HelpTxtOptManifestFeature": "Additional feature from the top-level manifest to install (manifest mode).",
+  "HelpTxtOptManifestNoDefault": "Don't install the default features from the top-level manifest (manifest mode).",
+  "HelpTxtOptNoDownloads": "Do not download new sources",
+  "HelpTxtOptNoUsage": "Don't print CMake usage information after install.",
+  "HelpTxtOptOnlyBinCache": "Fail if cached binaries are not available",
+  "HelpTxtOptOnlyDownloads": "Download sources but don't build packages",
+  "HelpTxtOptRecurse": "Allow removal of packages as part of installation",
+  "HelpTxtOptUseAria2": "Use aria2 to perform download tasks",
+  "HelpTxtOptUseHeadVersion": "Install the libraries on the command line using the latest upstream sources (classic mode)",
+  "HelpTxtOptWritePkgConfig": "Writes out a NuGet packages.config-formatted file for use with external binary caching.\nSee `vcpkg help binarycaching` for more information.",
   "HelpUpdateBaseline": "The best approach to keep your libraries up to date, the best approach is to update your baseline reference. This will ensure all packages, including transitive ones, are updated. However if you need to update a package independently, you can use a \"version>=\" constraint.",
   "HelpUpdateCommand": "List packages that can be updated.",
   "HelpUpgradeCommand": "Rebuild all outdated packages.",
@@ -531,7 +643,7 @@
   "InstalledRequestedPackages": "All requested packages are currently installed.",
   "InstallingFromLocation": "-- Installing port from location: {path}",
   "_InstallingFromLocation.comment": "'--' at the beginning must be preserved An example of {path} is /foo/bar.",
-  "InstallingMavenFile": "{path} installing maven file",
+  "InstallingMavenFile": "{path} installing Maven file",
   "_InstallingMavenFile.comment": "Printed after a filesystem operation error An example of {path} is /foo/bar.",
   "InstallingPackage": "Installing {action_index}/{count} {spec}...",
   "_InstallingPackage.comment": "An example of {action_index} is 340. An example of {count} is 42. An example of {spec} is zlib:x64-windows.",

src/vcpkg-test/arguments.cpp

@@ -88,7 +88,7 @@ TEST_CASE ("VcpkgCmdArguments from argument sequence with valued options", "[arg
 {
     SECTION ("case 1")
     {
-        std::array<CommandSetting, 1> settings = {{{"a", ""}}};
+        std::array<CommandSetting, 1> settings = {{{"a", nullptr}}};
         CommandStructure cmdstruct = {"", 0, SIZE_MAX, {{}, settings}, nullptr};
 
         std::vector<std::string> t = {"--a=b", "command", "argument"};
@@ -103,8 +103,8 @@ TEST_CASE ("VcpkgCmdArguments from argument sequence with valued options", "[arg
 
     SECTION ("case 2")
     {
-        std::array<CommandSwitch, 2> switches = {{{"a", ""}, {"c", ""}}};
-        std::array<CommandSetting, 2> settings = {{{"b", ""}, {"d", ""}}};
+        std::array<CommandSwitch, 2> switches = {{{"a", nullptr}, {"c", nullptr}}};
+        std::array<CommandSetting, 2> settings = {{{"b", nullptr}, {"d", nullptr}}};
         CommandStructure cmdstruct = {"", 0, SIZE_MAX, {switches, settings}, nullptr};
 
         std::vector<std::string> t = {"--a", "--b=c"};

src/vcpkg/base/messages.cpp

@@ -1046,4 +1046,115 @@ namespace vcpkg
     REGISTER_MESSAGE(PortBugMisplacedFilesCont);
     REGISTER_MESSAGE(PerformingPostBuildValidation);
     REGISTER_MESSAGE(FailedPostBuildChecks);
+    REGISTER_MESSAGE(HelpTxtOptDryRun);
+    REGISTER_MESSAGE(HelpTxtOptUseHeadVersion);
+    REGISTER_MESSAGE(HelpTxtOptNoDownloads);
+    REGISTER_MESSAGE(HelpTxtOptOnlyDownloads);
+    REGISTER_MESSAGE(HelpTxtOptOnlyBinCache);
+    REGISTER_MESSAGE(HelpTxtOptRecurse);
+    REGISTER_MESSAGE(HelpTxtOptKeepGoing);
+    REGISTER_MESSAGE(HelpTxtOptEditable);
+    REGISTER_MESSAGE(HelpTxtOptUseAria2);
+    REGISTER_MESSAGE(HelpTxtOptCleanAfterBuild);
+    REGISTER_MESSAGE(HelpTxtOptCleanBuildTreesAfterBuild);
+    REGISTER_MESSAGE(HelpTxtOptCleanPkgAfterBuild);
+    REGISTER_MESSAGE(HelpTxtOptCleanDownloadsAfterBuild);
+    REGISTER_MESSAGE(HelpTxtOptManifestNoDefault);
+    REGISTER_MESSAGE(HelpTxtOptEnforcePortChecks);
+    REGISTER_MESSAGE(HelpTxtOptAllowUnsupportedPort);
+    REGISTER_MESSAGE(HelpTxtOptNoUsage);
+    REGISTER_MESSAGE(HelpTxtOptWritePkgConfig);
+    REGISTER_MESSAGE(HelpTxtOptManifestFeature);
+    REGISTER_MESSAGE(CmdAddVersionOptAll);
+    REGISTER_MESSAGE(CmdAddVersionOptOverwriteVersion);
+    REGISTER_MESSAGE(CmdAddVersionOptSkipFormatChk);
+    REGISTER_MESSAGE(CmdAddVersionOptSkipVersionFormatChk);
+    REGISTER_MESSAGE(CmdAddVersionOptVerbose);
+    REGISTER_MESSAGE(CISettingsOptExclude);
+    REGISTER_MESSAGE(CISettingsOptHostExclude);
+    REGISTER_MESSAGE(CISettingsOptXUnit);
+    REGISTER_MESSAGE(CISettingsOptCIBase);
+    REGISTER_MESSAGE(CISettingsOptFailureLogs);
+    REGISTER_MESSAGE(CISettingsOptOutputHashes);
+    REGISTER_MESSAGE(CISettingsOptParentHashes);
+    REGISTER_MESSAGE(CISettingsOptSkippedCascadeCount);
+    REGISTER_MESSAGE(CISwitchOptDryRun);
+    REGISTER_MESSAGE(CISwitchOptRandomize);
+    REGISTER_MESSAGE(CISwitchOptAllowUnexpectedPassing);
+    REGISTER_MESSAGE(CISwitchOptSkipFailures);
+    REGISTER_MESSAGE(CISwitchOptXUnitAll);
+    REGISTER_MESSAGE(CmdContactOptSurvey);
+    REGISTER_MESSAGE(CISettingsVerifyVersion);
+    REGISTER_MESSAGE(CISettingsVerifyGitTree);
+    REGISTER_MESSAGE(CISettingsExclude);
+    REGISTER_MESSAGE(CmdDependInfoOptDot);
+    REGISTER_MESSAGE(CmdDependInfoOptDGML);
+    REGISTER_MESSAGE(CmdDependInfoOptDepth);
+    REGISTER_MESSAGE(CmdDependInfoOptMaxRecurse);
+    REGISTER_MESSAGE(CmdDependInfoOptSort);
+    REGISTER_MESSAGE(CmdEditOptBuildTrees);
+    REGISTER_MESSAGE(CmdEditOptAll);
+    REGISTER_MESSAGE(CmdEnvOptions);
+    REGISTER_MESSAGE(CmdFetchOptXStderrStatus);
+    REGISTER_MESSAGE(CmdFormatManifestOptAll);
+    REGISTER_MESSAGE(CmdFormatManifestOptConvertControl);
+    REGISTER_MESSAGE(CmdGenerateMessageMapOptOutputComments);
+    REGISTER_MESSAGE(CmdGenerateMessageMapOptNoOutputComments);
+    REGISTER_MESSAGE(CmdInfoOptInstalled);
+    REGISTER_MESSAGE(CmdInfoOptTransitive);
+    REGISTER_MESSAGE(CmdNewOptApplication);
+    REGISTER_MESSAGE(CmdNewOptSingleFile);
+    REGISTER_MESSAGE(CmdNewOptVersionRelaxed);
+    REGISTER_MESSAGE(CmdNewOptVersionDate);
+    REGISTER_MESSAGE(CmdNewOptVersionString);
+    REGISTER_MESSAGE(CmdNewSettingName);
+    REGISTER_MESSAGE(CmdNewSettingVersion);
+    REGISTER_MESSAGE(CmdRegenerateOptForce);
+    REGISTER_MESSAGE(CmdRegenerateOptDryRun);
+    REGISTER_MESSAGE(CmdRegenerateOptNormalize);
+    REGISTER_MESSAGE(HelpTextOptFullDesc);
+    REGISTER_MESSAGE(CmdSetInstalledOptDryRun);
+    REGISTER_MESSAGE(CmdSetInstalledOptNoUsage);
+    REGISTER_MESSAGE(CmdSetInstalledOptWritePkgConfig);
+    REGISTER_MESSAGE(CmdUpdateBaselineOptInitial);
+    REGISTER_MESSAGE(CmdUpdateBaselineOptDryRun);
+    REGISTER_MESSAGE(CmdUpgradeOptNoDryRun);
+    REGISTER_MESSAGE(CmdUpgradeOptNoKeepGoing);
+    REGISTER_MESSAGE(CmdUpgradeOptAllowUnsupported);
+    REGISTER_MESSAGE(CmdXDownloadOptStore);
+    REGISTER_MESSAGE(CmdXDownloadOptSkipSha);
+    REGISTER_MESSAGE(CmdXDownloadOptSha);
+    REGISTER_MESSAGE(CmdXDownloadOptUrl);
+    REGISTER_MESSAGE(CmdXDownloadOptHeader);
+    REGISTER_MESSAGE(CmdExportOptDryRun);
+    REGISTER_MESSAGE(CmdExportOptRaw);
+    REGISTER_MESSAGE(CmdExportOptNuget);
+    REGISTER_MESSAGE(CmdExportOptIFW);
+    REGISTER_MESSAGE(CmdExportOptZip);
+    REGISTER_MESSAGE(CmdExportOpt7Zip);
+    REGISTER_MESSAGE(CmdExportOptChocolatey);
+    REGISTER_MESSAGE(CmdExportOptPrefab);
+    REGISTER_MESSAGE(CmdExportOptMaven);
+    REGISTER_MESSAGE(CmdExportOptDebug);
+    REGISTER_MESSAGE(CmdExportOptInstalled);
+    REGISTER_MESSAGE(CmdExportSettingOutput);
+    REGISTER_MESSAGE(CmdExportSettingOutputDir);
+    REGISTER_MESSAGE(CmdExportSettingNugetID);
+    REGISTER_MESSAGE(CmdExportSettingNugetDesc);
+    REGISTER_MESSAGE(CmdExportSettingNugetVersion);
+    REGISTER_MESSAGE(CmdExportSettingRepoURL);
+    REGISTER_MESSAGE(CmdExportSettingPkgDir);
+    REGISTER_MESSAGE(CmdExportSettingRepoDir);
+    REGISTER_MESSAGE(CmdExportSettingConfigFile);
+    REGISTER_MESSAGE(CmdExportSettingInstallerPath);
+    REGISTER_MESSAGE(CmdExportSettingChocolateyMaint);
+    REGISTER_MESSAGE(CmdExportSettingChocolateyVersion);
+    REGISTER_MESSAGE(CmdExportSettingPrefabGroupID);
+    REGISTER_MESSAGE(CmdExportSettingPrefabArtifactID);
+    REGISTER_MESSAGE(CmdExportSettingPrefabVersion);
+    REGISTER_MESSAGE(CmdExportSettingSDKMinVersion);
+    REGISTER_MESSAGE(CmdExportSettingSDKTargetVersion);
+    REGISTER_MESSAGE(CmdRemoveOptRecurse);
+    REGISTER_MESSAGE(CmdRemoveOptDryRun);
+    REGISTER_MESSAGE(CmdRemoveOptOutdated);
 }