Merge remote-tracking branch 'upstream/master' into glog

microsoft · Apr 6, 2022 · 5562f6d · 5562f6d
2 parents 5e3e6d3 + 89295c9
commit 5562f6d
Show file tree

Hide file tree

Showing 3,496 changed files with 38,248 additions and 18,658 deletions.
diff --git a/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md b/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md
@@ -24,7 +24,7 @@ Repro code when
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Failure logs** 
+**Failure logs**
 -(please attached failure logs)
 
 **Additional context**

diff --git a/.github/ISSUE_TEMPLATE/report-package-build-failure.md b/.github/ISSUE_TEMPLATE/report-package-build-failure.md
@@ -15,7 +15,7 @@ assignees: ''
 Steps to reproduce the behavior:
 `./vcpkg install xxxx`
 
-**Failure logs** 
+**Failure logs**
 -Cut and paste the appropriate build messages from the console output.
 -Please attach any additional failure logs mentioned in the console output.
 

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,15 +1,15 @@
 **Describe the pull request**
 
-- #### What does your PR fix?  
+- #### What does your PR fix?
   Fixes #...
 
-- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)?  
+- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)?
   <all / linux, windows, ...>, <Yes/No>
 
-- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)?  
+- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)?
   `Your answer`
 
-- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?  
+- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?
   <Yes / I am still working on this PR>
 
 **If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/**
diff --git a/.github/workflows/trustedPR.yml b/.github/workflows/trustedPR.yml
@@ -17,18 +17,18 @@ jobs:
 
     steps:
       - name: 'Download artifact'
-        uses: actions/github-script@v3.1.0
+        uses: actions/github-script@v6
         with:
           script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
+            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
                owner: context.repo.owner,
                repo: context.repo.repo,
                run_id: ${{github.event.workflow_run.id }},
             });
             var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
               return artifact.name == "pr"
             })[0];
-            var download = await github.actions.downloadArtifact({
+            var download = await github.rest.actions.downloadArtifact({
                owner: context.repo.owner,
                repo: context.repo.repo,
                artifact_id: matchArtifact.id,
@@ -38,7 +38,7 @@ jobs:
             fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
       - run: unzip pr.zip
 
-      - uses: actions/github-script@v4
+      - uses: actions/github-script@v6
         with:
           script: |
             const { promises: fs } = require('fs')
@@ -55,4 +55,4 @@ jobs:
             if (body !== "") {
               req.body = body;
             }
-            await github.pulls.createReview(req);
+            await github.rest.pulls.createReview(req);
diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           # fetch-depth 50 tries to ensure we capture the whole history of the branch
           fetch-depth: 50
@@ -39,6 +39,7 @@ jobs:
           git config user.name github-actions@github.com
 
           git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake
+          git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license
           ./vcpkg format-manifest --all --convert-control
           git diff > .github-pr.format-manifest
           git add -u
@@ -50,14 +51,15 @@ jobs:
           git diff > .github-pr.x-add-version.diff
           git reset HEAD~ --mixed
 
-      - uses: actions/github-script@v4
+      - uses: actions/github-script@v6
         with:
           script: |
             const { promises: fs } = require('fs')
             const add_version = (await fs.readFile('.github-pr.x-add-version.diff', 'utf8')).trim()
             const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim()
             const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim()
             const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).trim()
+            const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim()
 
             let approve = true;
             var output = ''
@@ -72,7 +74,7 @@ jobs:
             if (add_version_out !== "") {
               output += "<details><summary><b>PRs must add only one version and must not modify any published versions</b></summary>\n\n"
               output += "When making any changes to a library, the version or port-version in `vcpkg.json` or `CONTROL` must be modified.\n"
-              output += "```\n" + add_version_out + "\n```\n</details>\n"
+              output += "```\n" + add_version_out + "\n```\n</details>\n\n"
               approve = false;
             }
             if (add_version !== "") {
@@ -102,7 +104,16 @@ jobs:
               output += '{\n  "name": "vcpkg-cmake-config",\n  "host": true\n}\n'
               output += "```\n"
               output += `The following files are affected:\n${cmake}\n`
-              output += "</details>\n"
+              output += "</details>\n\n"
+            }
+            if (missing_license !== "") {
+              output += 'You have modified or added at least one vcpkg.json where a "license" field is missing.\n'
+              output += "<details>\n\n"
+
+              output += 'If you feel able to do so, please consider adding a "license" field to the following files:\n'
+              output += missing_license
+              output += "\n\nValid values for the license field can be found in the [documentation](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/manifest-files.md#license)\n"
+              output += "</details>\n\n"
             }
 
             if (approve) {
@@ -115,7 +126,7 @@ jobs:
 
             console.log(output);
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: pr
           path: pr/
diff --git a/CONTRIBUTING_zh.md b/CONTRIBUTING_zh.md
@@ -0,0 +1,33 @@
+# 贡献准则
+
+Vcpkg 是一个尝试由社区驱动，旨在构建一个多产的、健壮的本地库生态系统 - 您的贡献价值不可估量！
+
+## 报告问题
+
+最简单的方法是通过 `vcpkg.exe` 或 [GitHub](https://github.com/Microsoft/vcpkg) 报告已有的包的问题。 当报告 `vcpkg.exe` 的问题时，确保清楚地说明:
+- 机器设置: “我用的是Windows 10周年更新。 我的机器正位于fr-fr区域。 我成功地运行了'install boost'。”
+- 复现步骤: “运行 'vcpkg list'”
+- 预期结果: “我预期看到 'boost:x86-windows'”
+- 实际结果: “没有输出” 或 “我得到一个崩溃对话框”
+
+当报告包的问题时，一定要清楚地说明:
+- 机器设置 (上述)
+- 您正在构建什么包以及它的版本，例如: “opencv 3.1.0”
+- 构建过程中的任何相关错误日志
+
+## 贡献 (PR)
+
+我们很乐意接受关于修复、特性、新包和更新现有包的拉取请求。 为了避免浪费您的时间，我们强烈建议您提交一个问题来讨论您想要制作的PR是否能被接受。 对于特性和新包来说也是如此。
+
+### 新包贡献准则
+
+我们很高兴您有兴趣来提交一个新的包! 这里有一些指导方针来帮助您编写一个优秀的端口文件:
+- 避免功能补丁。 当没有其他方法时，补丁应该被视为实现兼容性的最后手段。
+- 当无法避免补丁时，请不要修改默认行为。 一个补丁的理想生命周期是与上游合并，不再被需要。 在决定如何修补某些内容时，请记住这一目标。
+- 相比原始的 `execute_command` 调用，尽量改为通过 `vcpkg_xyz` 函数实现。这使得在添加新特性(如自定义编译器标志或生成器)时更容易进行长期维护。
+
+## 法律声明
+
+在您的拉取请求被接受之前，您需要完成一个贡献者许可协议 (CLA)。 本协议证明您允许我们使用您提交的源代码，并且本作品是在合适的许可下提交的，我们可以使用它。
+
+您可以通过 https://cla.microsoft.com 上的步骤来完成CLA。 一旦我们收到已签署的CLA，我们将审查请求。 您只需要这样做一次。
diff --git a/README.md b/README.md
@@ -19,8 +19,6 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help.
 * Discord: [\#include \<C++\>](https://www.includecpp.org), the #🌏vcpkg channel
 * Docs: [Documentation](docs/README.md)
 
-[![Build Status](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master)
-
 # Table of Contents
 
 - [Vcpkg: Overview](#vcpkg-overview)
@@ -30,7 +28,6 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help.
   - [Quick Start: Unix](#quick-start-unix)
   - [Installing Linux Developer Tools](#installing-linux-developer-tools)
   - [Installing macOS Developer Tools](#installing-macos-developer-tools)
-    - [Installing GCC for macOS before 10.15](#installing-gcc-for-macos-before-1015)
   - [Using vcpkg with CMake](#using-vcpkg-with-cmake)
     - [Visual Studio Code with CMake Tools](#visual-studio-code-with-cmake-tools)
     - [Vcpkg with Visual Studio CMake Projects](#vcpkg-with-visual-studio-cmake-projects)
@@ -40,6 +37,7 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help.
 - [Examples](#examples)
 - [Contributing](#contributing)
 - [License](#license)
+- [Security](#security)
 - [Telemetry](#telemetry)
 
 # Getting Started
@@ -328,7 +326,18 @@ with any additional questions or comments.
 
 # License
 
-The code in this repository is licensed under the [MIT License](LICENSE.txt).
+The code in this repository is licensed under the [MIT License](LICENSE.txt). The libraries
+provided by ports are licensed under the terms of their original authors. Where available, vcpkg
+places the associated license(s) in the location `installed/<triplet>/share/<port>/copyright`.
+
+# Security
+
+Most ports in vcpkg build the libraries in question using the original build system preferred
+by the original developers of those libraries, and download source code and build tools from their
+official distribution locations. For use behind a firewall, the specific access needed will depend
+on which ports are being installed. If you must install in in an "air gapped" environment, consider
+installing once in a non-"air gapped" environment, populating an
+[asset cache](docs/users/assetcaching.md) shared with the otherwise "air gapped" environment.
 
 # Telemetry
 

diff --git a/README_es.md b/README_es.md
@@ -22,8 +22,6 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o
 * Discord: [\#include \<C++\>](https://www.includecpp.org), en el canal #🌏vcpkg
 * Docs: [Documentación](docs/README.md)
 
-[![Estado de compilación](https://dev.azure.com/vcpkg/public/_apis/build/status/microsoft.vcpkg.ci?branchName=master)](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master)
-
 ## Tabla de contenido
 
 - [Vcpkg](#vcpkg)
@@ -33,7 +31,6 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o
     - [Inicio rápido: Unix](#inicio-rápido-unix)
     - [Instalando Herramientas de desarrollo en Linux](#instalando-herramientas-de-desarrollo-en-linux)
     - [Instalando Herramientas de desarrollo en macOS](#instalando-herramientas-de-desarrollo-en-macos)
-      - [Instalando GCC en macOS previo a 10.15](#instalando-gcc-en-macos-previo-a-1015)
     - [Usando Vcpkg con CMake](#usando-vcpkg-con-cmake)
       - [Visual Studio Code con CMake Tools](#visual-studio-code-con-cmake-tools)
       - [Vcpkg con proyectos de Visual Studio(CMake)](#vcpkg-con-proyectos-de-visual-studiocmake)
@@ -44,6 +41,7 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o
   - [Ejemplos](#ejemplos)
   - [Contribuyendo](#contribuyendo)
   - [Licencia](#licencia)
+- [Seguridad](#seguridad)
   - [Telemetría](#telemetría)
 
 ## Primeros pasos
@@ -134,9 +132,6 @@ Prerrequisitos para Linux:
 Prerrequisitos para macOS:
 
 - [Herramientas de desarrollo de Apple][getting-started:macos-dev-tools]
-- En macOS 10.14 o inferior, también necesita:
-  - [Homebrew][getting-started:macos-brew]
-  - [g++][getting-started:macos-gcc] >= 6 de Homebrew
 
 Primero, descargue y compile vcpkg, puede ser instalado donde sea,
 pero recomendamos usar vcpkg como submodulo para proyectos de CMake.
@@ -218,25 +213,6 @@ $ xcode-select --install
 
 Luego seguir los pasos que aparecerán en las ventanas que se muestran.
 
-En macOS 10.14 y previos, también requiere instalar g++ de homebrew;
-siguiendo los pasos en la sección siguiente.
-
-#### Instalando GCC en macOS previo a 10.15
-
-Este paso _solo_  es requerido si está usando una versión de macOS previa a 10.15.
-Instalar homebrew debería ser sencillo; visite <brew.sh> para mas información,
-pero de manera simple, ejecute el siguiente comando:
-
-```sh
-$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
-```
-
-luego, para obtener una versión actualizada de gcc, ejecute el comando:
-
-```sh
-$ brew install gcc
-```
-
 Posteriormente podrá compilar vcpkg junto con la [guía de inicio rápido](#inicio-rápido-unix)
 
 ### Usando Vcpkg con CMake
@@ -346,10 +322,8 @@ Para más información, revise la especificación de [manifiesto][getting-starte
 [getting-started:integration]: docs/users/integration.md
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
-[getting-started:linux-gcc]: #installing-linux-developer-tools
-[getting-started:macos-dev-tools]: #installing-macos-developer-tools
-[getting-started:macos-brew]: #installing-gcc-on-macos
-[getting-started:macos-gcc]: #installing-gcc-on-macos
+[getting-started:linux-gcc]: #Instalando-Herramientas-de-desarrollo-en-Linux
+[getting-started:macos-dev-tools]: #Instalando-Herramientas-de-desarrollo-en-macOS
 [getting-started:visual-studio]: https://visualstudio.microsoft.com/
 [getting-started:manifest-spec]: docs/specifications/manifests.md
 
@@ -366,7 +340,7 @@ para activar el autocompletado en la terminal de elección ejecute:
 o
 
 ```sh
-$ ./vcpkg integrate bash
+$ ./vcpkg integrate bash # o zsh
 ```
 
 según la terminal que use, luego reinicie la consola.
@@ -407,6 +381,16 @@ con cualquier pregunta adicional o comentarios.
 ## Licencia
 
 El código en este repositorio se encuentra licenciado mediante la [Licencia MIT](LICENSE.txt).
+Las bibliotecas proveídas por los `ports` están licenciadas mediante los terminos de los autores originales.
+Donde estén disponibles, vcpkg almacena las licencias asociadas en la siguiente ubicación `installed/<triplet>/share/<port>/copyright`.
+
+# Seguridad
+
+La mayoría de los `ports` en vcpkg construyen las bibliotecas usando su sistema de compilación preferido
+por los autores originales de las bibliotecas, y descargan el código fuente asi como las herramientas de compilación
+de sus ubicaciones de distribucion oficiales. Para aquellos que usan un firewall, el acceso dependerá de cuales `ports`
+están siendo instalados. Si tiene que instalarlos en un entorno aislado, puede instalarlos previamente en un entorno
+no aislado, generando un [caché del paquete](docs/users/assetcaching.md) compartido con el entorno aislado.
 
 ## Telemetría