From d8aca1f6ed7c44ac2102963d2e598d1b6394b4c3 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 13 Apr 2021 03:44:03 -0700 Subject: [PATCH 1/3] [vcpkg docs] Add the procedure for updating vcpkg to faq --- docs/about/faq.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/about/faq.md b/docs/about/faq.md index 2fb169fd3a583b..a9e8428345583e 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -30,6 +30,9 @@ We currently target Windows Desktop (x86 and x64) as well as the Universal Windo ## Does Vcpkg run on Linux/OSX? Yes! We continuously test on OSX and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help! +## How do I update vcpkg itself? +You can execute `git pull` to get latest source, then runing bootstrap-vcpkg.bat(on Windows) or bootstrap-vcpkg.sh(on Unix) to update vcpkg. + ## How do I use different versions of a library on one machine? Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages. From 3667fd385dbe842fafcd45e54f6b98741dc8a694 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 13 Apr 2021 23:14:47 -0700 Subject: [PATCH 2/3] Address the review suggestions --- docs/about/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about/faq.md b/docs/about/faq.md index a9e8428345583e..f69ac736a3340f 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -31,7 +31,7 @@ We currently target Windows Desktop (x86 and x64) as well as the Universal Windo Yes! We continuously test on OSX and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help! ## How do I update vcpkg itself? -You can execute `git pull` to get latest source, then runing bootstrap-vcpkg.bat(on Windows) or bootstrap-vcpkg.sh(on Unix) to update vcpkg. +You can execute `git pull` to get latest source, then run `bootstrap-vcpkg.bat` (Windows) or `./bootstrap-vcpkg.sh` (Unix) to update vcpkg. ## How do I use different versions of a library on one machine? Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages. From ddb355db8dcd67677525c8ed7177d6b930a589da Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 14 Apr 2021 18:18:08 -0700 Subject: [PATCH 3/3] Update the changes --- docs/about/faq.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/about/faq.md b/docs/about/faq.md index f69ac736a3340f..9b4fe9de9e96f8 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -30,8 +30,8 @@ We currently target Windows Desktop (x86 and x64) as well as the Universal Windo ## Does Vcpkg run on Linux/OSX? Yes! We continuously test on OSX and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help! -## How do I update vcpkg itself? -You can execute `git pull` to get latest source, then run `bootstrap-vcpkg.bat` (Windows) or `./bootstrap-vcpkg.sh` (Unix) to update vcpkg. +## How do I update vcpkg? +Execute `git pull` to get the latest sources, then run `bootstrap-vcpkg.bat` (Windows) or `./bootstrap-vcpkg.sh` (Unix) to update vcpkg. ## How do I use different versions of a library on one machine? Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages.