mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 01:24:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vcpkg_from_git: Add support for git over ssh (#9446)

Browse Source 
* vcpkg_from_git: Add support for git over ssh

* vcpkg_from_git: append ssh bin directory to path

* vcpkg_from_git: fix function signature on non windows platforms

* Revert "vcpkg_from_git: fix function signature on non windows platforms"

This reverts commit 0d608ee591.

* Revert "vcpkg_from_git: append ssh bin directory to path"

This reverts commit 377ce3fae1.

* Partial Revert "vcpkg_from_git: Add support for git over ssh"

This partially reverts commit 9b81b16c4c.

Co-authored-by: Marc Boucek <marc.boucek@native-instruments.de>
Co-authored-by: Marc Boucek <marc.boucek@posteo.net>
This commit is contained in:
Marc Boucek 2020-04-01 16:35:38 +02:00 committed by GitHub
parent e12c1acdb5
commit e1fc03c474
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/maintainers/vcpkg_from_git.md
View File

@ -19,7 +19,7 @@ Specifies the out-variable that will contain the extracted location.
This should be set to `SOURCE_PATH` by convention. This should be set to `SOURCE_PATH` by convention.
### URL ### URL
The url of the git repository. Must start with `https`. The url of the git repository.
### REF ### REF
The git sha of the commit to download. The git sha of the commit to download.

9
scripts/cmake/vcpkg_from_git.cmake
View File

@ -19,7 +19,7 @@
## This should be set to `SOURCE_PATH` by convention. ## This should be set to `SOURCE_PATH` by convention.
## ##
## ### URL ## ### URL
## The url of the git repository. Must start with `https`. ## The url of the git repository.
## ##
## ### REF ## ### REF
## The git sha of the commit to download. ## The git sha of the commit to download.
@ -49,13 +49,6 @@ function(vcpkg_from_git)
message(FATAL_ERROR "The git url must be specified") message(FATAL_ERROR "The git url must be specified")
endif() endif()
if( NOT _vdud_URL MATCHES "^https:")
# vcpkg_from_git does not support a SHA256 parameter because hashing the git archive is
# not stable across all supported platforms. The tradeoff is to require https to download
# and the ref to be the git sha (i.e. not things that can change like a label)
message(FATAL_ERROR "The git url must be https")
endif()
if(NOT DEFINED _vdud_REF) if(NOT DEFINED _vdud_REF)
message(FATAL_ERROR "The git ref must be specified.") message(FATAL_ERROR "The git ref must be specified.")
endif() endif()

6
toolsrc/src/vcpkg/base/system.process.cpp
View File

@ -241,6 +241,12 @@ namespace vcpkg
// Enables proxy information to be passed to Curl, the underlying download library in cmake.exe // Enables proxy information to be passed to Curl, the underlying download library in cmake.exe
L"http_proxy", L"http_proxy",
L"https_proxy", L"https_proxy",
// Environment variables to tell git to use custom SSH executable or command
L"GIT_SSH",
L"GIT_SSH_COMMAND",
// Environment variables needed for ssh-agent based authentication
L"SSH_AUTH_SOCK",
L"SSH_AGENT_PID",
// Enables find_package(CUDA) and enable_language(CUDA) in CMake // Enables find_package(CUDA) and enable_language(CUDA) in CMake
L"CUDA_PATH", L"CUDA_PATH",
L"CUDA_PATH_V9_0", L"CUDA_PATH_V9_0",