Skip to content

Commit

Permalink
Update vcpkg ports to use a manifest json file instead of a CONTROL f…
Browse files Browse the repository at this point in the history
…ile. (#2132)

* Update vcpkg ports to use a manifest json file instead of a CONTROL file.

* Update vcpkg ports to use a manifest json file instead of a CONTROL file
for remaining packages.

* Add the new vcpkg manifet json files and also update the template
package.

* Update paths in the cmake and eng scripts to find the right file now
that CONTROL is gone.
  • Loading branch information
ahsonkhan committed Apr 19, 2021
1 parent 7600267 commit d452e94
Show file tree
Hide file tree
Showing 20 changed files with 192 additions and 98 deletions.
4 changes: 2 additions & 2 deletions cmake-modules/AzureVcpkg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ macro(az_vcpkg_portfile_prep targetName fileName contentToRemove)
endmacro()

macro(az_vcpkg_export targetName macroNamePart dllImportExportHeaderPath)
# CONTROL file has an extra '#' in the comment section, because VcPkg can't handle an empty line at that position,
# The vcpkg.json file has an extra '#' in the comment section, because VcPkg can't handle an empty line at that position,
# and without that extra '#' line, the file contents look too crowded.
# Ultimately, the lines passed to az_vcpkg_portfile_prep() have to match the header comment that is actually
# present in the files, or otherwise nothing will be removed.
az_vcpkg_portfile_prep(
"${targetName}"
"CONTROL"
"vcpkg.json"
"# Copyright (c) Microsoft Corporation. All rights reserved.\n# SPDX-License-Identifier: MIT\n#\n"
)

Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/Initialize-VcpkgRelease.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ param (
# If there's nothing in the "port" folder to upload set SkipVcpkgUpdate to true
# and exit. Other steps will check SkipVcpkgUpdate to decide whether to move
# forward.
if (!(Get-ChildItem -Path "$SourceDirectory/port/CONTROL")) {
if (!(Get-ChildItem -Path "$SourceDirectory/port/vcpkg.json")) {
Write-Host "###vso[task.setvariable variable=SkipVcpkgUpdate]true"
exit
}
Expand Down
22 changes: 0 additions & 22 deletions sdk/core/azure-core/vcpkg/CONTROL

This file was deleted.

63 changes: 63 additions & 0 deletions sdk/core/azure-core/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-core-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Core SDK for C++",
"This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/core/azure-core",
"dependencies": [
{
"name": "openssl",
"platform": "!windows & !uwp"
}
],
"default-features": [
"http"
],
"features": {
"curl": {
"description": "Build an HTTP transport implementation with LibCURL",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false
},
"curl"
]
},
"http": {
"description": "Build all HTTP transport implementations, depending on the platform",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false,
"features": [
"curl"
]
},
{
"name": "azure-core-cpp",
"default-features": false,
"features": [
"curl",
"winhttp"
],
"platform": "windows & !uwp"
}
]
},
"winhttp": {
"description": "Build an HTTP transport implementation with WinHTTP",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false
}
]
}
}
}
9 changes: 0 additions & 9 deletions sdk/identity/azure-identity/vcpkg/CONTROL

This file was deleted.

15 changes: 15 additions & 0 deletions sdk/identity/azure-identity/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-identity-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Identity SDK for C++",
"This library provides common authentication-related abstractions for Azure SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/identity/azure-identity",
"dependencies": [
"azure-core-cpp"
]
}
9 changes: 0 additions & 9 deletions sdk/keyvault/azure-security-keyvault-common/vcpkg/CONTROL

This file was deleted.

15 changes: 15 additions & 0 deletions sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-security-keyvault-common-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Common Key Vault SDK for C++",
"This library provides common Azure KeyVault-related abstractions for Azure SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-common",
"dependencies": [
"azure-core-cpp"
]
}
9 changes: 0 additions & 9 deletions sdk/keyvault/azure-security-keyvault-keys/vcpkg/CONTROL

This file was deleted.

15 changes: 15 additions & 0 deletions sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-security-keyvault-keys-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Key Vault Keys SDK for C++",
"This library provides Azure Key Vault Keys SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-keys",
"dependencies": [
"azure-security-keyvault-common-cpp"
]
}
9 changes: 0 additions & 9 deletions sdk/storage/azure-storage-blobs/vcpkg/CONTROL

This file was deleted.

15 changes: 15 additions & 0 deletions sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-storage-blobs-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Storage Blobs SDK for C++",
"This library provides Azure Storage Blobs SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-blobs",
"dependencies": [
"azure-storage-common-cpp"
]
}
9 changes: 0 additions & 9 deletions sdk/storage/azure-storage-common/vcpkg/CONTROL

This file was deleted.

20 changes: 20 additions & 0 deletions sdk/storage/azure-storage-common/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-storage-common-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Common Storage SDK for C++",
"This library provides common Azure Storage-related abstractions for Azure SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-common",
"dependencies": [
"azure-core-cpp",
"libxml2",
{
"name": "openssl",
"platform": "!windows"
}
]
}
9 changes: 0 additions & 9 deletions sdk/storage/azure-storage-files-datalake/vcpkg/CONTROL

This file was deleted.

15 changes: 15 additions & 0 deletions sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-storage-files-datalake-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Storage Files Data Lake SDK for C++",
"This library provides Azure Storage Files Data Lake SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake",
"dependencies": [
"azure-storage-blobs-cpp"
]
}
9 changes: 0 additions & 9 deletions sdk/storage/azure-storage-files-shares/vcpkg/CONTROL

This file was deleted.

15 changes: 15 additions & 0 deletions sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-storage-files-shares-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Storage Files Shares SDK for C++",
"This library provides Azure Storage Files Shares SDK."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-shares",
"dependencies": [
"azure-storage-common-cpp"
]
}
10 changes: 0 additions & 10 deletions sdk/template/azure-template/vcpkg/CONTROL

This file was deleted.

16 changes: 16 additions & 0 deletions sdk/template/azure-template/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# SPDX-License-Identifier: MIT
#
{
"name": "azure-template-cpp",
"version-string": "@AZ_LIBRARY_VERSION@",
"description": [
"Microsoft Azure Template SDK for C++",
"This is a template library meant to illustrate initial client library development process for Azure SDK.",
"It is not meant to be published to vcpkg."
],
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/template/azure-template",
"dependencies": [
"azure-core-cpp"
]
}

0 comments on commit d452e94

Please sign in to comment.