Skip to content

[vcpkg_find_acquire_program] Add tool powershell #15728

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

Closed
JackBoosY wants to merge 13 commits into from
Closed

[vcpkg_find_acquire_program] Add tool powershell #15728

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1f083b0
[vcpkg_find_acquire_program] Add tool powershell
Jan 18, 2021
057e803
[protobuf] bump version to test changes
Jan 18, 2021
d2599e1
update baseline
Jan 18, 2021
6b98c36
[vcpkg_find_acquire_program] Update url, filename and hash
Jan 18, 2021
04115ee
update docs
Jan 18, 2021
5bdfa0f
[vcpkg_find_acquire_program] Add tool powershell
Jan 18, 2021
cae5d6a
[protobuf] bump version to test changes
Jan 18, 2021
c3eab4b
update baseline
Jan 18, 2021
0dee053
[vcpkg_find_acquire_program] Update url, filename and hash
Jan 18, 2021
6a0d451
update docs
Jan 18, 2021
e85f34d
Merge branch 'dev/jack/15681' of https://github.com/JackBoosY/vcpkg i…
Jan 22, 2021
9dd7b33
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Jan 22, 2021
27102ca
Update scripts/cmake/vcpkg_find_acquire_program.cmake
JackBoosY Jan 29, 2021
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
1 change: 1 addition & 0 deletions docs/maintainers/vcpkg_find_acquire_program.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ The current list of programs includes:
* GASPREPROCESSOR
* GPERF
* PERL
* POWERSHELL
* PYTHON2
* PYTHON3
* GIT
Expand Down
2 changes: 1 addition & 1 deletion ports/protobuf/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "protobuf",
"version-string": "3.14.0",
"port-version": 1,
"port-version": 2,
"description": "Protocol Buffers - Google's data interchange format",
"homepage": "https://github.com/protocolbuffers/protobuf",
"features": {
Expand Down
7 changes: 2 additions & 5 deletions scripts/cmake/vcpkg_copy_tool_dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@ This command should always be called by portfiles after they have finished rearr

function(vcpkg_copy_tool_dependencies TOOL_DIR)
if (VCPKG_TARGET_IS_WINDOWS)
find_program(PWSH_EXE pwsh)
if (NOT PWSH_EXE)
message(FATAL_ERROR "Could not find PowerShell Core; please open an issue to report this.")
endif()
vcpkg_find_acquire_program(POWERSHELL)
macro(search_for_dependencies PATH_TO_SEARCH)
file(GLOB TOOLS "${TOOL_DIR}/*.exe" "${TOOL_DIR}/*.dll" "${TOOL_DIR}/*.pyd")
foreach(TOOL IN LISTS TOOLS)
vcpkg_execute_required_process(
COMMAND "${PWSH_EXE}" -noprofile -executionpolicy Bypass -nologo
COMMAND "${POWERSHELL}" -noprofile -executionpolicy Bypass -nologo
-file "${SCRIPTS}/buildsystems/msbuild/applocal.ps1"
-targetBinary "${TOOL}"
-installedDir "${PATH_TO_SEARCH}"
Expand Down
11 changes: 11 additions & 0 deletions scripts/cmake/vcpkg_find_acquire_program.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ The current list of programs includes:
* GASPREPROCESSOR
* GPERF
* PERL
* POWERSHELL
* PYTHON2
* PYTHON3
* GIT
Expand Down Expand Up @@ -115,6 +116,16 @@ function(vcpkg_find_acquire_program VAR)
set(BREW_PACKAGE_NAME "git")
set(APT_PACKAGE_NAME "git")
endif()
elseif(VAR MATCHES "POWERSHELL")
set(PROGNAME pwsh)
if(CMAKE_HOST_WIN32)
set(PWSH_VERSION 7.1.10)
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
Comment thread
JackBoosY marked this conversation as resolved.
Outdated
set(SUBDIR "powershell-core-${PWSH_VERSION}-windows")
set(URL "https://github.com/PowerShell/PowerShell/releases/download/v${PWSH_VERSION}/PowerShell-${PWSH_VERSION}-win-x86.zip")
set(ARCHIVE "PowerShell-${PWSH_VERSION}-win-x86.zip")
set(HASH ea6ed619c784af65b09a5e98cdfc0d41333ba7373b7409e488ec70aaf1e0c4e5568e846d2b1748d72c3e3a9c1a4827f0ba29e9f6e93e79b4f49312ca40af6d2a)
set(PATHS "${DOWNLOADS}/tools/${SUBDIR}")
endif()
elseif(VAR MATCHES "GN")
set(PROGNAME gn)
set(_vfa_RENAME "gn")
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4646,7 +4646,7 @@
},
"protobuf": {
"baseline": "3.14.0",
"port-version": 1
"port-version": 2
},
"protobuf-c": {
"baseline": "1.3.2-2",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/protobuf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d50267f946dba451a1b2fba7e9876562e32be7e5",
"version-string": "3.14.0",
"port-version": 2
},
{
"git-tree": "2a90dca85ce43bc6cb008cce7d6706e319bc645b",
"version-string": "3.14.0",
Expand Down