Skip to content

Commit

Permalink
Merge remote-tracking branch 'mixxxdj/2.5' into 2.5-rel
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Aug 17, 2023
2 parents 5cf5341 + 6bd376f commit 43d3b62
Show file tree
Hide file tree
Showing 2,440 changed files with 24,739 additions and 11,764 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
blank_issues_enabled: false
blank_issues_enabled: true
contact_links:
- name: I have a question
url: https://github.com/microsoft/vcpkg/discussions
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
matrix:
include:
- os: windows-2019
vcpkg_path: C:\mixxx-vcpkg
vcpkg_path: D:\mixxx-vcpkg
vcpkg_bootstrap: .\bootstrap-vcpkg.bat
vcpkg_triplet: x64-windows
vcpkg_host_triplet: x64-windows
Expand All @@ -28,6 +28,7 @@ jobs:
env:
VCPKG_PACKAGES: >-
ableton
benchmark
chromaprint
fdk-aac
ffmpeg
Expand Down Expand Up @@ -77,13 +78,19 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Check out git repository
uses: LebedevRI/checkout@issue197
uses: actions/checkout@v3
with:
path: ${{ matrix.vcpkg_path }}
path: mixxx-vcpkg

# Workaround for issues https://github.com/microsoft/vcpkg/issues/8272
# and https://github.com/actions/checkout/issues/197
# to keep the build path short
- name: Move checkout
run: cmake -E rename ${{ github.workspace }}/mixxx-vcpkg ${{ matrix.vcpkg_path }}

- name: Set outputs
- name: Read sha_short
id: vars
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
working-directory: ${{ matrix.vcpkg_path }}

- name: Bootstrap vcpkg
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/check_issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- opened

jobs:
missing-windows-sdk-issue:
check-for-common-issues:
runs-on: ubuntu-latest
permissions:
issues: write
Expand All @@ -20,6 +20,8 @@ jobs:
repo: context.repo.repo
};
let issue = await github.rest.issues.get(issue_query)
// missing-windows-sdk-issue
let reg = /RC Pass 1: command "rc .*" failed \(exit code 0\) with the following output:/;
if (reg.test(issue.data.body)){
await github.rest.issues.removeAllLabels(issue_query);
Expand All @@ -30,3 +32,13 @@ jobs:
await github.rest.issues.createComment({...issue_query, body});
// Close the issue?
}
// msys2 download fails => old vcpkg version
reg = /error: https:\/\/repo\.msys2\.org\/.*: failed: status code 404/;
if (reg.test(issue.data.body)){
await github.rest.issues.removeAllLabels(issue_query);
await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
let body = "Try updating your vcpkg version via `git pull` to resolve this issue. MSYS2 downloads are removed from the upstream servers from time to time, so using an up-to-date vcpkg version is necessary."
await github.rest.issues.createComment({...issue_query, body});
// Close the issue?
}
31 changes: 31 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: 'Close stale issues and PRs'
on:
schedule:
- cron: '30 1 * * *'

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v6
with:
stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
only-labels: 'category:question'
days-before-issue-stale: 28
days-before-pr-stale: -1
days-before-close: 14
- uses: actions/stale@v6
with:
stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
only-labels: 'requires:repro'
days-before-issue-stale: 28
days-before-pr-stale: -1
days-before-close: 14
- uses: actions/stale@v6
with:
stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
any-of-labels: 'category:new-port'
close-issue-label: 'info:new-port-unresolved'
days-before-issue-stale: 60
days-before-pr-stale: -1
days-before-close: 14
23 changes: 11 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ Prerequisites:
- [Git][getting-started:git]
- [Visual Studio][getting-started:visual-studio] 2015 Update 3 or greater with the English language pack

First, download and bootstrap vcpkg itself; it can be installed anywhere,
but generally we recommend using vcpkg as a submodule for CMake projects,
and installing it globally for Visual Studio projects.
We recommend somewhere like `C:\src\vcpkg` or `C:\dev\vcpkg`,
since otherwise you may run into path issues for some port build systems.
First, download and bootstrap vcpkg itself; it can be installed anywhere, but generally we recommend using vcpkg as a
submodule so the consuming repo can stay self-contained. Alternatively, vcpkg can be installed globally; we recommend
somewhere like `C:\src\vcpkg` or `C:\dev\vcpkg`, since otherwise you may run into path issues for some port build
systems.

```cmd
> git clone https://github.com/microsoft/vcpkg
Expand Down Expand Up @@ -133,7 +132,7 @@ Prerequisites for macOS:
- [Apple Developer Tools][getting-started:macos-dev-tools]

First, download and bootstrap vcpkg itself; it can be installed anywhere,
but generally we recommend using vcpkg as a submodule for CMake projects.
but generally we recommend using vcpkg as a submodule.

```sh
$ git clone https://github.com/microsoft/vcpkg
Expand Down Expand Up @@ -237,7 +236,7 @@ Finally, in `CMake options`, add the following line:

You must add this line to each profile.

### Vcpkg as a Submodule
### Vcpkg as a Submodule with CMake

When using vcpkg as a submodule of your project,
you can add the following to your CMakeLists.txt before the first `project()` call,
Expand All @@ -252,7 +251,7 @@ This will still allow people to not use vcpkg,
by passing the `CMAKE_TOOLCHAIN_FILE` directly,
but it will make the configure-build step slightly easier.

[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages.md
[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
[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
Expand Down Expand Up @@ -282,9 +281,9 @@ depending on the shell you use, then restart your console.
# Examples

See the [documentation](https://learn.microsoft.com/vcpkg) for specific walkthroughs,
including [installing and using a package](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages.md),
[adding a new package from a zipfile](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles.md),
and [adding a new package from a GitHub repo](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos.md).
including [installing and using a package](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
[adding a new package from a zipfile](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
and [adding a new package from a GitHub repo](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos).

Our docs are now also available online at our website https://vcpkg.io/. We really appreciate any and all feedback! You can submit an issue in https://github.com/vcpkg/vcpkg.github.io/issues.

Expand Down Expand Up @@ -323,7 +322,7 @@ by the original developers of those libraries, and download source code and buil
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](https://learn.microsoft.com/vcpkg/users/assetcaching.md) shared with the otherwise "air gapped" environment.
[asset cache](https://learn.microsoft.com/vcpkg/users/assetcaching) shared with the otherwise "air gapped" environment.

# Telemetry

Expand Down
22 changes: 9 additions & 13 deletions README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o
* este programa en: [vcpkg-tool GitHub](https://github.com/microsoft/vcpkg-tool)
* [Slack](https://cppalliance.org/slack/), en el canal #vcpkg
* Discord: [\#include \<C++\>](https://www.includecpp.org), en el canal #🌏vcpkg
* Docs: [Documentación](docs/README.md)
* Docs: [Documentación](https://learn.microsoft.com/vcpkg)

## Tabla de contenido

Expand Down Expand Up @@ -55,7 +55,7 @@ puede [abrir una incidencia en el repositorio de GitHub][contributing:submit-iss
donde el equipo de vcpkg y la comunidad pueden verlo, y potencialmente hacer un port a vcpkg.

Después de tener Vcpkg instalado y funcionando,
puede que desee añadir [completado con tab](#Completado-TabAuto-Completado) en su terminal.
puede que desee añadir [completado con tab](#Completado-TabAutoCompletado) en su terminal.

Finalmente, si está interesado en el futuro de Vcpkg,
puede ver la guía de [archivos de manifiesto][getting-started:manifest-spec]!
Expand Down Expand Up @@ -119,9 +119,6 @@ Con CMake, todavía necesitara `find_package` y las configuraciones adicionales
Revise la [Sección de Cmake](#usando-vcpkg-con-cmake) para más información,
incluyendo el uso de CMake con un IDE.

Para cualquier otra herramienta, incluyendo Visual Studio Code,
reviste la [guía de integración][getting-started:integration].

### Inicio rápido: Unix

Prerrequisitos para Linux:
Expand Down Expand Up @@ -318,14 +315,13 @@ puede usar un simple `vcpkg install --feature-flags=manifests`

Para más información, revise la especificación de [manifiesto][getting-started:manifest-spec]

[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
[getting-started:integration]: docs/users/buildsystems/integration.md
[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
[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]: #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
[getting-started:manifest-spec]: https://learn.microsoft.com/en-us/vcpkg/users/manifests

## Completado-Tab/Autocompletado

Expand All @@ -347,10 +343,10 @@ según la terminal que use, luego reinicie la consola.

## Ejemplos

ver la [documentación](docs/README.md) para tutoriales específicos, incluyendo
[instalando y usando un paquete](docs/examples/installing-and-using-packages.md),
[agregando un nuevo paquete desde un archivo comprimido](docs/examples/packaging-zipfiles.md),
[agregando un nuevo paquete desde un repositorio en GitHub](docs/examples/packaging-github-repos.md).
ver la [documentación](https://learn.microsoft.com/vcpkg) para tutoriales específicos, incluyendo
[instalando y usando un paquete](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
[agregando un nuevo paquete desde un archivo comprimido](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
[agregando un nuevo paquete desde un repositorio en GitHub](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos).

Nuestra documentación también esta disponible en nuestro sitio web [vcpkg.io](https://vcpkg.io/).
Si necesita ayuda puede [crear un incidente](https://github.com/vcpkg/vcpkg.github.io/issues).
Expand Down Expand Up @@ -390,7 +386,7 @@ La mayoría de los `ports` en vcpkg construyen las bibliotecas usando su sistema
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.
no aislado, generando un [caché del paquete](https://learn.microsoft.com/vcpkg/users/assetcaching) compartido con el entorno aislado.

## Telemetría

Expand Down
14 changes: 7 additions & 7 deletions README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Pour une description des commandes disponibles, quand vous avez installé vcpkg,
* GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)
* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel
* Discord: [\#include \<C++\>](https://www.includecpp.org), le canal #🌏vcpkg
* Docs: [Documentation](docs/README.md)
* Docs: [Documentation](https://learn.microsoft.com/vcpkg)

[![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)

Expand Down Expand Up @@ -244,16 +244,16 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems

Cela permettra toujours aux gens de ne pas utiliser vcpkg, en passant directement le CMAKE_TOOLCHAIN_FILE, mais cela rendra l'étape de configuration-construction légèrement plus facile.

[getting-started:utiliser-un-paquet]: docs/examples/installing-and-using-packages.md
[getting-started:integration]: docs/users/buildsystems/integration.md
[getting-started:utiliser-un-paquet]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
[getting-started:integration]: https://learn.microsoft.com/en-us/vcpkg/users/buildsystems/msbuild-integration
[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:visual-studio]: https://visualstudio.microsoft.com/
[getting-started:manifest-spec]: docs/specifications/manifests.md
[getting-started:manifest-spec]: https://learn.microsoft.com/en-us/vcpkg/users/manifests

# Tab-complétion/Auto-complétion

Expand All @@ -274,9 +274,9 @@ selon le shell que vous utilisez, puis redémarrez la console.

# Exemples

Lisez la [documentation](doc/README.md) pour des instructions plus spécifiques ainsi que [l'installation et l'utilisation des paquets](docs/examples/installing-and-using-packages.md),
[ajouter un nouveau paquet depuis un fichier zip](docs/examples/packaging-zipfiles.md),
et [ajouter un nouveau paquet depuis un dépôt GitHub](docs/examples/packaging-github-repos.md).
Lisez la [documentation](https://learn.microsoft.com/vcpkg) pour des instructions plus spécifiques ainsi que [l'installation et l'utilisation des paquets](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
[ajouter un nouveau paquet depuis un fichier zip](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
et [ajouter un nouveau paquet depuis un dépôt GitHub](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos).

La documentation est aussi disponible en ligne sur ReadTheDocs : <https://vcpkg.readthedocs.io/> !

Expand Down
18 changes: 9 additions & 9 deletions README_ko_KR.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Vcpkg를 설치하였다면, `vcpkg help` 명령어로 사용 가능한 명령
* GitHub: port는 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)에, 관련 프로그램은 [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)에 있습니다.
* Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), #vcpkg 채널
* Discord: [\#include \<C++\>](https://www.includecpp.org), #🌏vcpkg 채널
* 도움말: [Documentation](docs/README.md)
* 도움말: [Documentation](https://learn.microsoft.com/vcpkg)

# 목차

Expand Down Expand Up @@ -261,16 +261,16 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems
또한, 여전히 `CMAKE_TOOLCHAIN_FILE`을 직접 전달하면
vcpkg를 사용하지 않을 수 있습니다.

[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
[getting-started:integration]: docs/users/buildsystems/integration.md
[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
[getting-started:integration]: https://learn.microsoft.com/en-us/vcpkg/users/buildsystems/msbuild-integration
[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:visual-studio]: https://visualstudio.microsoft.com/
[getting-started:manifest-spec]: docs/specifications/manifests.md
[getting-started:manifest-spec]: https://learn.microsoft.com/en-us/vcpkg/users/manifests

# 탭 완성/자동 완성

Expand All @@ -289,10 +289,10 @@ $ ./vcpkg integrate bash # or zsh

# 예시

[패키지 설치 및 사용](docs/examples/installing-and-using-packages.md),
[zip 파일에서 새 패키지 추가](docs/examples/packaging-zipfiles.md),
[GitHub 저장소에서 새 패키지 추가](docs/examples/packaging-github-repos.md)
대한 구체적인 예시는 [문서](docs/README.md)를 참고하세요.
[패키지 설치 및 사용](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages),
[zip 파일에서 새 패키지 추가](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles),
[GitHub 저장소에서 새 패키지 추가](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos)
대한 구체적인 예시는 [문서](https://learn.microsoft.com/vcpkg)를 참고하세요.

문서는 이제 웹사이트 https://vcpkg.io/ 에서도 온라인으로 확인 가능합니다. 모든 피드백에 진심으로 감사드립니다!
https://github.com/vcpkg/vcpkg.github.io/issues 에서 이슈를 제출할 수 있습니다.
Expand Down Expand Up @@ -331,7 +331,7 @@ Vcpk가 제공하는 대부분의 port는 각각의 라이브러리를 빌드할
소스 코드와 빌드 도구를 각각의 공식 배포처로부터 다운로드합니다.
방화벽 뒤에서 사용하는 경우, 어떤 port를 설치하느냐에 따라 필요한 접근 권한이 달라질 수 있습니다.
만약 "air gapped" 환경에서 설치해야만 한다면, "air gapped"가 아닌 환경에서
[asset 캐시](docs/users/assetcaching.md)를 다운로드하고,
[asset 캐시](https://learn.microsoft.com/vcpkg/users/assetcaching)를 다운로드하고,
이후에 "air gapped" 환경에서 공유하는 것을 고려해 보십시오.

# 데이터 수집
Expand Down
Loading

0 comments on commit 43d3b62

Please sign in to comment.