mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Add bootstrap-vcpkg.bat to improve first-time experience.

Browse Source
This commit is contained in:
Robert Schumacher 2017-04-01 03:58:45 -07:00
parent b788c2b209
commit db73e73c56
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -14,7 +14,7 @@ Prerequisites:
Clone this repository, then run
```
C:\src\vcpkg> powershell -exec bypass scripts\bootstrap.ps1
C:\src\vcpkg> .\bootstrap-vcpkg.bat
```
Then, to hook up user-wide integration, run (note: requires admin on first use)
```

2
bootstrap-vcpkg.bat Normal file
View File

@ -0,0 +1,2 @@
@echo off
powershell.exe -ExecutionPolicy Bypass "%~dp0scripts\bootstrap.ps1"

2
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -2,7 +2,7 @@ function(vcpkg_configure_cmake)
cmake_parse_arguments(_csc "PREFER_NINJA" "SOURCE_PATH;GENERATOR" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" ${ARGN})
if(NOT VCPKG_PLATFORM_TOOLSET)
message(FATAL_ERROR "Vcpkg has been updated with VS2017 support, however you need to rebuild vcpkg.exe by re-running bootstrap.ps1\n powershell -exec bypass scripts\\bootstrap.ps1\n")
message(FATAL_ERROR "Vcpkg has been updated with VS2017 support, however you need to rebuild vcpkg.exe by re-running bootstrap-vcpkg.bat\n")
endif()
if(_csc_GENERATOR)

4
toolsrc/src/commands_update.cpp
View File

@ -56,7 +56,7 @@ namespace vcpkg::Commands::Update
System::println("The following packages differ from their port versions:");
for (auto&& package : outdated_packages)
{
System::println(" %-27s %s", package.spec.display_name(), package.version_diff.toString());
System::println(" %-32s %s", package.spec.display_name(), package.version_diff.toString());
}
System::println("\nTo update these packages, run\n vcpkg remove --purge <pkgs>...\n vcpkg install <pkgs>...");
}
@ -74,7 +74,7 @@ namespace vcpkg::Commands::Update
{
if (maj1 != maj2 || min1 != min2 || rev1 != rev2)
{
System::println("Different source is available for vcpkg (%d.%d.%d -> %d.%d.%d). Use powershell -exec bypass scripts/bootstrap.ps1 to update.",
System::println("Different source is available for vcpkg (%d.%d.%d -> %d.%d.%d). Use bootstrap-vcpkg.bat to update.",
maj2, min2, rev2,
maj1, min1, rev1);
}