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

Deduplicate even more things #1359

Merged
merged 4 commits into from
Mar 9, 2024
Merged

Deduplicate even more things #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7435367
Deduplicate even more things
BillyONeal Mar 2, 2024
001e398
Merge remote-tracking branch 'origin/main' into deduplicate-string-li…
BillyONeal Mar 6, 2024
3e0fc7d
Separate SPDX constants as suggested by @ras0219-msft
BillyONeal Mar 7, 2024
e212789
clang-format
BillyONeal Mar 7, 2024
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
22 changes: 11 additions & 11 deletions azure-pipelines/end-to-end-tests-dir/bundles.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ $b = @{
downloads = Join-Path $VcpkgRoot "downloads"
packages = Join-Path $VcpkgRoot "packages"
installed = Join-Path $VcpkgRoot "installed"
versions_output = Join-Path $VcpkgRoot "buildtrees" "versioning_" "versions"
'versions-output' = Join-Path $VcpkgRoot "buildtrees" "versioning_" "versions"
tools = Join-Path $VcpkgRoot "downloads" "tools"
vcpkg_root = $VcpkgRoot
'vcpkg-root' = $VcpkgRoot
}
foreach ($k in $b.keys) {
if ($a[$k] -ne $b[$k]) {
Expand All @@ -67,9 +67,9 @@ $b = @{
downloads = Join-Path $cache_home "vcpkg" "downloads"
packages = $null
installed = $null
versions_output = $null
'versions-output' = $null
tools = Join-Path $cache_home "vcpkg" "downloads" "tools"
vcpkg_root = $VcpkgRoot
'vcpkg-root' = $VcpkgRoot
}
foreach ($k in $b.keys) {
if ($a[$k] -ne $b[$k]) {
Expand Down Expand Up @@ -97,10 +97,10 @@ $b = @{
downloads = Join-Path $cache_home "vcpkg" "downloads"
packages = Join-Path $manifestdir "vcpkg_installed" "vcpkg" "pkgs"
installed = Join-Path $manifestdir "vcpkg_installed"
versions_output = Join-Path $manifestdir "vcpkg_installed" "vcpkg" "blds" "versioning_" "versions"
'versions-output' = Join-Path $manifestdir "vcpkg_installed" "vcpkg" "blds" "versioning_" "versions"
tools = Join-Path $cache_home "vcpkg" "downloads" "tools"
vcpkg_root = $VcpkgRoot
manifest_mode_enabled = $True
'vcpkg-root' = $VcpkgRoot
'manifest-mode-enabled' = $True
}
foreach ($k in $b.keys) {
if ($a[$k] -ne $b[$k]) {
Expand Down Expand Up @@ -137,10 +137,10 @@ $b = @{
downloads = Join-Path $cache_home "vcpkg" "downloads"
packages = $packagesRoot
installed = $installRoot
versions_output = Join-Path $buildtreesRoot "versioning_" "versions"
'versions-output' = Join-Path $buildtreesRoot "versioning_" "versions"
tools = Join-Path $cache_home "vcpkg" "downloads" "tools"
vcpkg_root = $VcpkgRoot
manifest_mode_enabled = $True
'vcpkg-root' = $VcpkgRoot
'manifest-mode-enabled' = $True
}
foreach ($k in $b.keys) {
if ($a[$k] -ne $b[$k]) {
Expand Down Expand Up @@ -198,7 +198,7 @@ Run-Vcpkg search vcpkg-hello-world-1 @commonArgs `
Throw-IfFailed

# Test CI environment detection
$detected_ci_key = 'detected_ci_environment'
$detected_ci_key = 'detected-ci-environment'
$known_ci_vars = (
"env:VCPKG_NO_CI",
"env:TF_BUILD",
Expand Down
81 changes: 81 additions & 0 deletions include/vcpkg/base/contractual-constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,60 @@ namespace vcpkg

// JSON IDs are lowercase separated by dashes
inline constexpr StringLiteral JsonIdAbi = "abi";
inline constexpr StringLiteral JsonIdAcquiredArtifacts = "acquired-artifacts";
inline constexpr StringLiteral JsonIdActivatedArtifacts = "activated-artifacts";
inline constexpr StringLiteral JsonIdAlgorithm = "algorithm";
inline constexpr StringLiteral JsonIdAllCapsSHA256 = "SHA256";
inline constexpr StringLiteral JsonIdAllCapsSHA512 = "SHA512";
inline constexpr StringLiteral JsonIdApply = "apply";
inline constexpr StringLiteral JsonIdArchiveCapitalLocation = "archiveLocation";
inline constexpr StringLiteral JsonIdArtifact = "artifact";
inline constexpr StringLiteral JsonIdBaseline = "baseline";
inline constexpr StringLiteral JsonIdBuildtrees = "buildtrees";
inline constexpr StringLiteral JsonIdBuiltin = "builtin";
inline constexpr StringLiteral JsonIdBuiltinBaseline = "builtin-baseline";
inline constexpr StringLiteral JsonIdBuiltinError = "builtin-error";
inline constexpr StringLiteral JsonIdBuiltinFiles = "builtin-files";
inline constexpr StringLiteral JsonIdBuiltinGit = "builtin-git";
inline constexpr StringLiteral JsonIdCacheCapitalId = "cacheId";
inline constexpr StringLiteral JsonIdCacheCapitalSize = "cacheSize";
inline constexpr StringLiteral JsonIdChecksums = "checksums";
inline constexpr StringLiteral JsonIdComment = "comment";
inline constexpr StringLiteral JsonIdContacts = "contacts";
inline constexpr StringLiteral JsonIdCorrelator = "correlator";
inline constexpr StringLiteral JsonIdCreated = "created";
inline constexpr StringLiteral JsonIdCreators = "creators";
inline constexpr StringLiteral JsonIdDefault = "default";
inline constexpr StringLiteral JsonIdDefaultFeatures = "default-features";
inline constexpr StringLiteral JsonIdDefaultRegistry = "default-registry";
inline constexpr StringLiteral JsonIdDefaultTriplet = "default-triplet";
inline constexpr StringLiteral JsonIdDemands = "demands";
inline constexpr StringLiteral JsonIdDependencies = "dependencies";
inline constexpr StringLiteral JsonIdDescription = "description";
inline constexpr StringLiteral JsonIdDetectedCIEnvironment = "detected-ci-environment";
inline constexpr StringLiteral JsonIdDetector = "detector";
inline constexpr StringLiteral JsonIdDirect = "direct";
inline constexpr StringLiteral JsonIdDocumentation = "documentation";
inline constexpr StringLiteral JsonIdDollarSchema = "$schema";
inline constexpr StringLiteral JsonIdDownloads = "downloads";
inline constexpr StringLiteral JsonIdError = "error";
inline constexpr StringLiteral JsonIdFeatures = "features";
inline constexpr StringLiteral JsonIdFiles = "files";
inline constexpr StringLiteral JsonIdFilesystem = "filesystem";
inline constexpr StringLiteral JsonIdGit = "git";
inline constexpr StringLiteral JsonIdGitTree = "git-tree";
inline constexpr StringLiteral JsonIdHomepage = "homepage";
inline constexpr StringLiteral JsonIdHost = "host";
inline constexpr StringLiteral JsonIdHostTriplet = "host-triplet";
inline constexpr StringLiteral JsonIdId = "id";
inline constexpr StringLiteral JsonIdInstalled = "installed";
inline constexpr StringLiteral JsonIdJob = "job";
inline constexpr StringLiteral JsonIdKey = "key";
inline constexpr StringLiteral JsonIdKind = "kind";
inline constexpr StringLiteral JsonIdLicense = "license";
inline constexpr StringLiteral JsonIdLocation = "location";
inline constexpr StringLiteral JsonIdMaintainers = "maintainers";
inline constexpr StringLiteral JsonIdManifestModeEnabled = "manifest-mode-enabled";
inline constexpr StringLiteral JsonIdManifestRoot = "manifest-root";
inline constexpr StringLiteral JsonIdManifests = "manifests";
inline constexpr StringLiteral JsonIdMessage = "message";
Expand All @@ -60,6 +82,7 @@ namespace vcpkg
inline constexpr StringLiteral JsonIdReference = "reference";
inline constexpr StringLiteral JsonIdRegistries = "registries";
inline constexpr StringLiteral JsonIdRelationship = "relationship";
inline constexpr StringLiteral JsonIdRelationships = "relationships";
inline constexpr StringLiteral JsonIdRepository = "repository";
inline constexpr StringLiteral JsonIdRequires = "requires";
inline constexpr StringLiteral JsonIdResolved = "resolved";
Expand All @@ -69,23 +92,60 @@ namespace vcpkg
inline constexpr StringLiteral JsonIdState = "state";
inline constexpr StringLiteral JsonIdSummary = "summary";
inline constexpr StringLiteral JsonIdSupports = "supports";
inline constexpr StringLiteral JsonIdTools = "tools";
inline constexpr StringLiteral JsonIdTriplet = "triplet";
inline constexpr StringLiteral JsonIdUrl = "url";
inline constexpr StringLiteral JsonIdVcpkgAssetSources = "vcpkg-asset-sources";
inline constexpr StringLiteral JsonIdVcpkgConfiguration = "vcpkg-configuration";
inline constexpr StringLiteral JsonIdVcpkgDisableMetrics = "vcpkg-disable-metrics";
inline constexpr StringLiteral JsonIdVcpkgDotJson = "vcpkg.json";
inline constexpr StringLiteral JsonIdVcpkgDownloads = "vcpkg-downloads";
inline constexpr StringLiteral JsonIdVcpkgRoot = "vcpkg-root";
inline constexpr StringLiteral JsonIdVcpkgRootArg = "vcpkg-root-arg";
inline constexpr StringLiteral JsonIdVcpkgRootEnv = "vcpkg-root-env";
inline constexpr StringLiteral JsonIdVersion = "version";
inline constexpr StringLiteral JsonIdVersionDate = "version-date";
inline constexpr StringLiteral JsonIdVersionGreaterEqual = "version>=";
inline constexpr StringLiteral JsonIdVersions = "versions";
inline constexpr StringLiteral JsonIdVersionSemver = "version-semver";
inline constexpr StringLiteral JsonIdVersionsOutput = "versions-output";
inline constexpr StringLiteral JsonIdVersionString = "version-string";
inline constexpr StringLiteral JsonIdWarning = "warning";

// SPDX constants are JsonIds which follow capitalization and separation in the SPDX specification,
// rather than the lowercase-dash convention used above.
//
// SPDX documents also use the JsonId constants above for those values consistent with those we
// would use in other contexts.
inline constexpr StringLiteral SpdxCCZero = "CC0-1.0";
inline constexpr StringLiteral SpdxChecksumValue = "checksumValue";
inline constexpr StringLiteral SpdxContainedBy = "CONTAINED_BY";
inline constexpr StringLiteral SpdxContains = "CONTAINS";
inline constexpr StringLiteral SpdxCopyrightText = "copyrightText";
inline constexpr StringLiteral SpdxCreationInfo = "creationInfo";
inline constexpr StringLiteral SpdxDataLicense = "dataLicense";
inline constexpr StringLiteral SpdxDependencyManifestOf = "DEPENDENCY_MANIFEST_OF";
inline constexpr StringLiteral SpdxDocumentNamespace = "documentNamespace";
inline constexpr StringLiteral SpdxDownloadLocation = "downloadLocation";
inline constexpr StringLiteral SpdxElementId = "spdxElementId";
inline constexpr StringLiteral SpdxFileName = "fileName";
inline constexpr StringLiteral SpdxGeneratedFrom = "GENERATED_FROM";
inline constexpr StringLiteral SpdxGenerates = "GENERATES";
inline constexpr StringLiteral SpdxLicenseConcluded = "licenseConcluded";
inline constexpr StringLiteral SpdxLicenseDeclared = "licenseDeclared";
inline constexpr StringLiteral SpdxNoAssertion = "NOASSERTION";
inline constexpr StringLiteral SpdxNone = "NONE";
inline constexpr StringLiteral SpdxPackageFileName = "packageFileName";
inline constexpr StringLiteral SpdxRefBinary = "SPDXRef-binary";
inline constexpr StringLiteral SpdxRefDocument = "SPDXRef-DOCUMENT";
inline constexpr StringLiteral SpdxRefPort = "SPDXRef-port";
inline constexpr StringLiteral SpdxRelatedSpdxElement = "relatedSpdxElement";
inline constexpr StringLiteral SpdxRelationshipType = "relationshipType";
inline constexpr StringLiteral SpdxSpdxId = "SPDXID";
inline constexpr StringLiteral SpdxTwoTwo = "SPDX-2.2";
inline constexpr StringLiteral SpdxVersion = "spdxVersion";
inline constexpr StringLiteral SpdxVersionInfo = "versionInfo";

// Paragraph IDs are *usually* Capitals-Separated-By-Dashes
inline constexpr StringLiteral ParagraphIdAbi = "Abi";
inline constexpr StringLiteral ParagraphIdArchitecture = "Architecture";
Expand Down Expand Up @@ -306,6 +366,7 @@ namespace vcpkg
inline constexpr StringLiteral CMakeVariableEnvPassthrough = "VCPKG_ENV_PASSTHROUGH";
inline constexpr StringLiteral CMakeVariableEnvPassthroughUntracked = "VCPKG_ENV_PASSTHROUGH_UNTRACKED";
inline constexpr StringLiteral CMakeVariableFeatures = "FEATURES";
inline constexpr StringLiteral CMakeVariableFilename = "FILENAME";
inline constexpr StringLiteral CMakeVariableGit = "GIT";
inline constexpr StringLiteral CMakeVariableHostTriplet = "_HOST_TRIPLET";
inline constexpr StringLiteral CMakeVariableLoadVcvarsEnv = "VCPKG_LOAD_VCVARS_ENV";
Expand All @@ -330,9 +391,14 @@ namespace vcpkg
inline constexpr StringLiteral CMakeVariablePortConfigs = "VCPKG_PORT_CONFIGS";
inline constexpr StringLiteral CMakeVariableProhibitBackcompatFeatures = "_VCPKG_PROHIBIT_BACKCOMPAT_FEATURES";
inline constexpr StringLiteral CMakeVariablePublicAbiOverride = "VCPKG_PUBLIC_ABI_OVERRIDE";
inline constexpr StringLiteral CMakeVariableRef = "REF";
inline constexpr StringLiteral CMakeVariableRepo = "REPO";
inline constexpr StringLiteral CMakeVariableSHA512 = "SHA512";
inline constexpr StringLiteral CMakeVariableTargetArchitecture = "VCPKG_TARGET_ARCHITECTURE";
inline constexpr StringLiteral CMakeVariableTargetTriplet = "TARGET_TRIPLET";
inline constexpr StringLiteral CMakeVariableTargetTripletFile = "TARGET_TRIPLET_FILE";
inline constexpr StringLiteral CMakeVariableUrl = "URL";
inline constexpr StringLiteral CMakeVariableUrls = "URLS";
inline constexpr StringLiteral CMakeVariableUseHeadVersion = "VCPKG_USE_HEAD_VERSION";
inline constexpr StringLiteral CMakeVariableVersion = "VERSION";
inline constexpr StringLiteral CMakeVariableVisualStudioPath = "VCPKG_VISUAL_STUDIO_PATH";
Expand All @@ -358,6 +424,8 @@ namespace vcpkg
// Environment variables are ALL_CAPS_WITH_UNDERSCORES
inline constexpr StringLiteral EnvironmentVariableActionsCacheUrl = "ACTIONS_CACHE_URL";
inline constexpr StringLiteral EnvironmentVariableActionsRuntimeToken = "ACTIONS_RUNTIME_TOKEN";
inline constexpr StringLiteral EnvironmentVariableAndroidNdkHome = "ANDROID_NDK_HOME";
inline constexpr StringLiteral EnvironmentVariableAppData = "APPDATA";
inline constexpr StringLiteral EnvironmentVariableAppveyor = "APPVEYOR";
inline constexpr StringLiteral EnvironmentVariableBuildId = "BUILD_ID";
inline constexpr StringLiteral EnvironmentVariableBuildNumber = "BUILD_NUMBER";
Expand All @@ -366,6 +434,7 @@ namespace vcpkg
inline constexpr StringLiteral EnvironmentVariableCIProjectId = "CI_PROJECT_ID";
inline constexpr StringLiteral EnvironmentVariableCircleCI = "CIRCLECI";
inline constexpr StringLiteral EnvironmentVariableCodebuildBuildId = "CODEBUILD_BUILD_ID";
inline constexpr StringLiteral EnvironmentVariableEditor = "EDITOR";
inline constexpr StringLiteral EnvironmentVariableGitCeilingDirectories = "GIT_CEILING_DIRECTORIES";
inline constexpr StringLiteral EnvironmentVariableGitHubActions = "GITHUB_ACTIONS";
inline constexpr StringLiteral EnvironmentVariableGitHubJob = "GITHUB_JOB";
Expand All @@ -386,28 +455,40 @@ namespace vcpkg
inline constexpr StringLiteral EnvironmentVariableInclude = "INCLUDE";
inline constexpr StringLiteral EnvironmentVariableJenkinsHome = "JENKINS_HOME";
inline constexpr StringLiteral EnvironmentVariableJenkinsUrl = "JENKINS_URL";
inline constexpr StringLiteral EnvironmentVariableLocalAppData = "LOCALAPPDATA";
inline constexpr StringLiteral EnvironmentVariableOverlayTriplets = "VCPKG_OVERLAY_TRIPLETS";
inline constexpr StringLiteral EnvironmentVariablePath = "PATH";
inline constexpr StringLiteral EnvironmentVariablePlatform = "Platform";
inline constexpr StringLiteral EnvironmentVariableProgramFiles = "PROGRAMFILES";
inline constexpr StringLiteral EnvironmentVariableProgramFilesX86 = "ProgramFiles(x86)";
inline constexpr StringLiteral EnvironmentVariableProgramW6432 = "ProgramW6432";
inline constexpr StringLiteral EnvironmentVariablePythonPath = "PYTHONPATH";
inline constexpr StringLiteral EnvironmentVariableSystemRoot = "SystemRoot";
inline constexpr StringLiteral EnvironmentVariableTeamcityVersion = "TEAMCITY_VERSION";
inline constexpr StringLiteral EnvironmentVariableTfBuild = "TF_BUILD";
inline constexpr StringLiteral EnvironmentVariableTravis = "TRAVIS";
inline constexpr StringLiteral EnvironmentVariableUserprofile = "USERPROFILE";
inline constexpr StringLiteral EnvironmentVariableVCInstallDir = "VCINSTALLDIR";
inline constexpr StringLiteral EnvironmentVariableVcpkgBinarySources = "VCPKG_BINARY_SOURCES";
inline constexpr StringLiteral EnvironmentVariableVcpkgCommand = "VCPKG_COMMAND";
inline constexpr StringLiteral EnvironmentVariableVcpkgDefaultBinaryCache = "VCPKG_DEFAULT_BINARY_CACHE";
inline constexpr StringLiteral EnvironmentVariableVcpkgDefaultHostTriplet = "VCPKG_DEFAULT_HOST_TRIPLET";
inline constexpr StringLiteral EnvironmentVariableVcpkgDefaultTriplet = "VCPKG_DEFAULT_TRIPLET";
inline constexpr StringLiteral EnvironmentVariableVcpkgDisableMetrics = "VCPKG_DISABLE_METRICS";
inline constexpr StringLiteral EnvironmentVariableVcpkgDownloads = "VCPKG_DOWNLOADS";
inline constexpr StringLiteral EnvironmentVariableVcpkgFeatureFlags = "VCPKG_FEATURE_FLAGS";
inline constexpr StringLiteral EnvironmentVariableVcpkgForceDownloadedBinaries = "VCPKG_FORCE_DOWNLOADED_BINARIES";
inline constexpr StringLiteral EnvironmentVariableVcpkgForceSystemBinaries = "VCPKG_FORCE_SYSTEM_BINARIES";
inline constexpr StringLiteral EnvironmentVariableVcpkgKeepEnvVars = "VCPKG_KEEP_ENV_VARS";
inline constexpr StringLiteral EnvironmentVariableVcpkgMaxConcurrency = "VCPKG_MAX_CONCURRENCY";
inline constexpr StringLiteral EnvironmentVariableVcpkgNoCi = "VCPKG_NO_CI";
inline constexpr StringLiteral EnvironmentVariableVcpkgNuGetRepository = "VCPKG_NUGET_REPOSITORY";
inline constexpr StringLiteral EnvironmentVariableVcpkgOverlayPorts = "VCPKG_OVERLAY_PORTS";
inline constexpr StringLiteral EnvironmentVariableVcpkgRoot = "VCPKG_ROOT";
inline constexpr StringLiteral EnvironmentVariableVcpkgUseNuGetCache = "VCPKG_USE_NUGET_CACHE";
inline constexpr StringLiteral EnvironmentVariableVcpkgVisualStudioPath = "VCPKG_VISUAL_STUDIO_PATH";
inline constexpr StringLiteral EnvironmentVariableVscmdArgTgtArch = "VSCMD_ARG_TGT_ARCH";
inline constexpr StringLiteral EnvironmentVariableVSCmdSkipSendTelemetry = "VSCMD_SKIP_SENDTELEMETRY";
inline constexpr StringLiteral EnvironmentVariableVsLang = "VSLANG";
inline constexpr StringLiteral EnvironmentVariableXVcpkgAssetSources = "X_VCPKG_ASSET_SOURCES";
inline constexpr StringLiteral EnvironmentVariableXVcpkgIgnoreLockFailures = "X_VCPKG_IGNORE_LOCK_FAILURES";
Expand Down
Loading
Loading