diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-01 03:58:45 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-01 03:58:45 -0700 |
| commit | db73e73c562a00228dd8c01ee2a03f03012023fc (patch) | |
| tree | c027a51e9b140f70a67c93d2455622d00f42d508 | |
| parent | b788c2b2098093843d4521d12a617199af39e7dc (diff) | |
| download | vcpkg-db73e73c562a00228dd8c01ee2a03f03012023fc.tar.gz vcpkg-db73e73c562a00228dd8c01ee2a03f03012023fc.zip | |
[vcpkg] Add bootstrap-vcpkg.bat to improve first-time experience.
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | bootstrap-vcpkg.bat | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 2 | ||||
| -rw-r--r-- | toolsrc/src/commands_update.cpp | 4 |
4 files changed, 6 insertions, 4 deletions
@@ -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) ``` diff --git a/bootstrap-vcpkg.bat b/bootstrap-vcpkg.bat new file mode 100644 index 000000000..2c73cd430 --- /dev/null +++ b/bootstrap-vcpkg.bat @@ -0,0 +1,2 @@ +@echo off +powershell.exe -ExecutionPolicy Bypass "%~dp0scripts\bootstrap.ps1" diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index e434d78b7..81616d72d 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -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) diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp index b6c933521..e23bfa7e9 100644 --- a/toolsrc/src/commands_update.cpp +++ b/toolsrc/src/commands_update.cpp @@ -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); } |