Commit Graph

80 Commits

Author SHA1 Message Date
Billy O'Neal
97e7ac8d74
[vcpkg] Repair msbuild damage and workaround the way we integrate on VS2015. (#19767)
* Repair msbuild damage and workaround the way we integrate on VS2015.

This is a fix for a pile of issues discovered by https://github.com/microsoft/vcpkg/pull/18906

* VS 2015 has a bug that the <VcpkgInstalledDir Condition="!$(VcpkgInstalledDir.EndsWith('\'))">$(VcpkgInstalledDir)\</VcpkgInstalledDir> dance we do to get a trailing slash is not applied correctly when VcpkgInstalledDir was edited in the same property group attempting to add the trailing slash.
* We need a trailing slash on VcpkgInstalledDir at all times, but https://github.com/microsoft/vcpkg/pull/16173 damaged this by removing it from TreatAsLocalProperty. Add the right TreatAsLocalPropertys back. Add all such slash defenses to the top of the file just beneath, eliminating need to call Path::Combine and friends by following msbuild "directory properties have a trailing slash" convention.
* Move VcpkgOSTarget and VcpkgPlatformTarget into the .targets, as they aren't intended to be overridable by users and don't appear in our selection dialog box(es).
* Don't bother avoiding setting vcpkg properties when VcpkgEnabled is off; after all, VcpkgEnabled is itself a vcpkg property :). I left attempts to skip creating items since creating items can hit the disk.
* Add _Z to several internal msbuild variables.
* Move VcpkgApplocalDeps to the .props since it's a user setting.
* Don't unconditionally use $(TLogLocation) because it is not set on 2015, and also it's per-project.
* Fixed typo in docs "VcpkgInstalledDirectory", and document the limitation that it doesn't work in 2015.
* In manifest mode, put the installed tree in a subdirectory including the triplet to make changing configurations faster.

Known limitations:

* If you change vcpkg.json without changing any .cpp files, we don't rebuild the dependencies even though we should. I don't know how to fix this but it doesn't appear to be a regression.

* Fix .tlog handling.

* Further defend against modified properties on VS2015.

* Document more VS2015 limitations.

* Remove TreatAsLocalProperty comment.
2021-09-02 12:33:21 -07:00
autoantwort
2777eada3f
[docs] improve integrate documentation (#19700)
* [docs] improve integrate documentation

* Small suggestions

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-08-30 17:11:16 -07:00
Kevin Lalumiere
c13c218522
[vcpkg] Add triplet option VCPKG_NO_COMPILER_TRACKING (#17526) 2021-08-25 20:36:28 -07:00
autoantwort
6b24f0fa76
[docs] Improve assetcaching.md (#19625)
* Improve asset caching readme

* Update assetcaching.md

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-08-17 17:33:44 -07:00
Billy O'Neal
5fd29d9350
Fix title capitalization from https://github.com/vcpkg/vcpkg.github.io/pull/54 (#19345) 2021-08-03 13:56:45 -07:00
Eric Kilmer
f7c83acf48
[docs] Describe nugettimeout option in binarycaching (#19084) 2021-07-23 13:35:23 -07:00
Victor Romero
3c82e1931e
[docs] More Getting Started fixes (#18970)
* Use valid commmit ID for baseline

* More doc fixes
2021-07-20 16:24:38 -07:00
Julian Xhokaxhiu
ae5b1cf41b
[binarycaching.md] Improve Azure DevOps example (#18807)
Add a missing, but required task for Azure DevOps Pipelines, to automatically authenticate against the Artifacts registry.
This should help any vcpkg newcomer to integrate easily.
2021-07-06 13:37:15 -07:00
autoantwort
876e67c26e
[vcpkg.cmake] PREPEND CMAKE_FIND_ROOT_PATH (#17336)
* [vcpkg.cmake] PREPEND CMAKE_FIND_ROOT_PATH

* [vcpkg.cmake] make PREPEND optional (default off, option VCPKG_PREFER_VCPKG_LIBS)

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update scripts/buildsystems/vcpkg.cmake

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-23 15:30:46 -07:00
pastdue
38d2893b30
Add VCPKG_MAKE_CONFIGURE_OPTIONS (that can be set in the triplet) (#18132)
* Add VCPKG_MAKE_CONFIGURE_OPTIONS that can be set in the triplet

To append options to the configure command

* Add documentation

* Expand without quotes

Co-Authored-By: ras0219 <533828+ras0219@users.noreply.github.com>

* Add VCPKG_CMAKE_CONFIGURE_OPTIONS that can be set in the triplet

Co-Authored-By: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Bump vcpkg-cmake port-version

* Run x-add-version vcpkg-cmake

* Apply suggestions from code review

* [vcpkg-cmake] add version

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-08 09:50:09 -07:00
ras0219
8c497bb647
[vcpkg] Add experimental $X_VCPKG_ASSET_SOURCES for source caching (#13639)
* [vcpkg] Add experimental $VCPKG_X_READWRITE_MIRROR_URL_TEMPLATE for source caching

* [vcpkg] Use prerelease version for testing

* [docs] Add assetcaching.md

* Revert bootstrap changes

* [vcpkg_download_distfile] Deprecate SILENT_EXIT

* cmake_parse_arguments() always defines option arguments

* Adjust CI baseline

* [vcpkg_download_distfile] Address CR comments, restore ARIA2

* [CI] Add source caching to Linux and OSX CI passes

* [ci.baseline.txt] Skip chartdir on more platforms
2021-06-04 16:48:26 -07:00
Mats Taraldsvik
9411ed741e
[docs] Updated list of off-by-default features (#18258) 2021-06-03 12:26:40 -07:00
Augustin Popa
ce6253b6f4
[Doc] Update binarycaching.md with clearer description (#18033)
* Update binarycaching.md with clearer description

We received user feedback about the binary caching feature not being clear. I rewrote some of the opening section to try to describe it better. Feedback is appreciated.

* Apply suggestions from code review

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2021-05-26 10:28:37 -07:00
nicole mazzuca
a3db16a447
[native supports-expr] docs changes (#16971) 2021-05-21 13:14:02 -07:00
Kai Pastor
5a271a9290
[doc] Fix spelling errors (#17560)
* [doc] Fix spelling errors in docs

* [doc] Fix spelling errors in scripts

* Bump version

* x-add-version

* Fix another typo

* Rebuild
2021-05-09 10:48:42 -07:00
nicole mazzuca
6e80675573
[docs registries] Add reference documentation (#17672)
* using registries reference documentation

* start work on "creating registries" document

also fix minor issue in "using registries" doc

* Robert's comments, continue working

* finish creating registries docs

* add links to example registries

* aupopa cr
2021-05-06 12:13:29 -07:00
Robert Schumacher
2924119c1e
[docs] Consolidate versioning documentation (#17580)
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
2021-05-03 09:43:34 -07:00
autoantwort
44d94c2edb
[docs] binarycaching.md: Move Configuration section to the top. Add table of… (#17060)
* binarycaching.md: Move Configuration section to the top. Add table of contents. Make clear that file location must be absolute. Add that read is the default mode.

* Apply suggestions from code review

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2021-04-30 12:40:18 -07:00
Phoebe
713e3aeb3f
[docs] Fix broken links (#17566)
* [docs] Fix broken links

* Fix the charactor

* Update the charactor
2021-04-29 13:39:50 -07:00
Kai Pastor
6240751612
[docs] Add mingw documentation (#17219)
* Add mingw documentation

* Minor edits

* Fix typos

* Revise comments about tools

* Make mingw-w64 explicit

* Fix another typo

* How to avoid mixing different installations

* Ban '/bin' from 'PATH', too

* Update mingw.md

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-04-28 14:49:21 -07:00
Kai Pastor
99a179d84d
Fix broken link (#17484) 2021-04-28 13:52:32 -07:00
Robert Schumacher
0f1ca21567
[docs-triplets] Suggest overlay triplets (#16867) 2021-03-29 09:40:08 -07:00
Park DongHa
2b903edac3
[docs] Vulkan SDK usage for Android triplets (#16881)
* [docs] Vulkan SDK usage for Android triplets

* [docs] update links

* redirect to developer.android.com for some keywords

* Update docs/users/android.md

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>

* [docs] add detailed path for libvulkan.so

Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2021-03-29 09:30:34 -07:00
ras0219
75522bb1f2
[docs] Improve inter-document linking; add 'latest' links (#16502)
* [docs] Improve inter-document linking; add 'latest' links

* [docs] Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-03-11 16:37:49 -08:00
Carlos O'Ryan
8010840071
[docs/users/binarycaching.md] a little blurb about using GCS (#16337)
* [docs/users/binarycaching.md] a little blurb about using GCS

* Address review comments

* Small tweaks
2021-03-10 19:34:12 -06:00
nicole mazzuca
fe2a6bb789
[host dependencies] add support in the scripts (#16627)
This contains all the docs and scripts changes from #16479,
without any of the ports changes, for easier CR
2021-03-10 15:33:16 -08:00
ras0219
45ae65fd93
[docs] Add CMake Integration to manifests.md (#16323)
* [docs] Add CMake Integration to manifests.md

* [docs] Add command line reference to manifests.md

* Update docs/users/manifests.md

Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
2021-02-26 13:10:37 -08:00
Carlos O'Ryan
a09f19c379
[docs/users/manifests.md] add a link to the specification (#16336)
* [docs/users/manifests.md] add a link to the specification

* Accept review suggestions

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2021-02-24 13:55:16 -08:00
Phoebe
5c1731cf74
[vcpkg docs] Update the versioning.getting-started.md (#16324) 2021-02-20 21:17:04 -08:00
nicole mazzuca
8d7cd1d09e
[vcpkg integrate install] Allow setting the vcpkg installed dir (#16173)
* [vcpkg integrate install] Allow setting the vcpkg installed dir

* fix the cache-y thing

* robert crs
2021-02-10 16:22:33 -08:00
ras0219
4502f8ed68
[vcpkg.targets] Add an additional options parameter for MSBuild integration (#16155)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-02-09 15:35:06 -08:00
Robert Schumacher
50651b1680
[docs/users/manifests.md] Prioritize examples. Fix example. Add MSBuild integration documentation. (#16069)
* [docs/users/manifests.md] Prioritize examples. Fix example. Add MSBuild integration documentation.

* Update docs/users/manifests.md

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update docs/users/manifests.md

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-02-09 14:03:41 -08:00
Victor Romero
3187f09a3c
[vcpkg] More versioning docs (#15693)
* [vcpkg] Versioning docs: Getting started

* Versioning docs: Getting started [revised]

* Link to example of manifests in msbuild

* [WIP] Reference docs

* [vcpkg] Fix links in Getting Started with Versioning
2021-02-08 12:03:37 -08:00
Kevin Lalumiere
f60b947e13
[vcpkg] Allow to use Nuget's cache for Nuget binary caching sources (fix #15169) (#15512)
* Fix warning on clang version 10.0.0-4ubuntu1

The warning was

```shell
../src/vcpkg/commands.porthistory.cpp:55:14: error: unused function 'is_date' [-Werror,-Wunused-function]
```

* Add environment variable VCPKG_USE_NUGET_CACHE

As the name suggests, this environment variable allow tu use Nuget
cache for Nuget binary caching sources.

* Document NuGet's Cache environment variable
2021-01-24 23:11:02 -08:00
ras0219
4f8fb510ba
[vcpkg] Add initial versioning documentation (#15565)
* [vcpkg] Improve efficiency and tests of versioning

* [vcpkg] Add initial versioning documentation and rename x-default-baseline to builtin-baseline

* [vcpkg] Enable metrics for builtin-baseline & overrides

* [vcpkg] Address PR comments

* [vcpkg] Add support for  syntax in version>=

* [vcpkg] Remove port-version from dependency syntax

* [vcpkg] Address CR comment

* [vcpkg] Minor docs fixup
2021-01-15 12:35:48 -08:00
ras0219
6b346462ba
[vcpkg] Improve docs for binarycaching (#15396) 2021-01-05 14:37:04 -08:00
ras0219
9a81392e48
[vcpkg] VCPKG_ENV_PASSTHROUGH_UNTRACKED (#15115)
* [vcpkg] Add VCPKG_ENV_PASSTHROUGH_UNTRACKED

* [vcpkg] CR comments

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-12-17 11:35:08 -08:00
ras0219
acb6b10e7f
[vcpkg] Fix uploading to Azure DevOps Artifacts (#14952) 2020-12-08 10:46:46 -08:00
ras0219
5c48bee451
[vcpkg] Add experimental x-azblob binary provider (#13626)
* [vcpkg] Add experimental x-azblob binary provider

* [vcpkg] Test azblob storage provider in CI

* [vcpkg] Address some CR comments from #13639

* [vcpkg] Fixup azure-pipelines

* [vcpkg] Fix regression where the downloaded package is purged before decompressing

* [vcpkg] Further refactor vcpkg::Downloads

* [vcpkg] Enable OSX for x-azblob testing

* [vcpkg] Reduce diff against master

* [vcpkg] Extract Downloads::details::split_uri_view

* [vcpkg] Address PR comments

* [vcpkg] Add testing and metrics for x-azblob

* [vcpkg] Add docs for x-azblob

This includes a note that it is currently experimental

* [vcpkg] Address CR comments

* [vcpkg] Revert pipeline changes except OSX to minimize disruption

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-11-18 12:21:23 -08:00
miheer vaidya
b36ada7d75
[vcpkg] User help: selecting-library-features.md (#14189) 2020-11-02 17:26:25 -08:00
ras0219
d1ba685e97
[vcpkg] Further JSON error improvements (#13399)
* [vcpkg] Split vcpkg/base/json.h into vcpkg/base/jsonreader.h

* [vcpkg] Extract definitions of Configuration-Deserializer (& friends)

These types are only used by VcpkgPaths during the initial parse.

* [vcpkg] Introduce levenshtein-distance suggestions for json errors

* [vcpkg] Fix regression in supports handling

* [vcpkg] Fix signed/unsigned mismatch

* [vcpkg] Address CR comments

* [vcpkg] Address CR comments

* Fix compiler error from merge conflict.

* [vcpkg] Change parameters of Reader::check_for_unexpected_fields to better match declaration

* [vcpkg] Improve errors from features set

* [vcpkg] Fix includes

* [vcpkg] Reuse code

* [vcpkg] Check the "name" field always to maximize error information

* [docs] Improve english phrasing in manifests.md

* [vcpkg] Correct docs link for manifests

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-10-12 10:22:47 -07:00
Alexander Neumann
0c1c43742d
[vcpkg] add env var VCPKG_OVERLAY_TRIPLETS (#12790)
* [vcpkg] add env var VCPKG_OVERLAY_TRIPLETS

* shorten way to complicated doc

* run clang format

* Apply CR

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Apply CR2

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-09-28 07:51:16 -07:00
ras0219
c98fd09290
[vcpkg-docs] Add note about GitHub hosted agents (#13641)
* [vcpkg_docs] Add note about GitHub hosted agents

* [vcpkg-docs] Add ./ prefixes to GitHub example

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-09-27 17:52:09 -07:00
Rafael Rivera
9c605a5efe
[vcpkg_docs] Fix feature flags option typo (#13578) 2020-09-17 13:10:02 -07:00
ras0219
54a09ff4ef
[vcpkg-docs] Add docs/users/binarycaching.md (#13517)
* [vcpkg-docs] Add docs/users/binarycaching.md

* [vcpkg] Address PR Comments

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-09-15 18:04:12 -07:00
nicole mazzuca
0fec1340eb
[vcpkg manifest] Add documentation! (#13488)
* [vcpkg docs] add docs for manifest files

These are just for the maintainer docs,
not user docs.

* [vcpkg] EBNF-ify platform expression parsing

this modifies nothing about what strings are accepted or rejected,
it just moves stuff around.

also adds tests.

* [vcpkg docs] add manifest mode example

* [wip] docs for augustin

also fix tabs

* [vcpkg manifest] switch to using maps for features

* Apply suggestions from code review

* un-experimentize format-manifest

* flesh out the user manifest mode docs

* CRs

* billy CRs

* final personal pass-thru
2020-09-14 15:07:02 -07:00
Paul
6c7f2d95d8
11129: Add VCPKG_LINKER_FLAGS_<CONFIG>. (#11290)
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-09-03 11:00:35 -07:00
Frank Theile
5c056a65bb
Fix bullet lists for integration.md on readthedocs.io (#12873) 2020-08-19 21:13:37 -07:00
Alexander Neumann
4fb846bd44
[vcpkg] add environment variable VCPKG_OVERLAY_PORTS (#12640)
* [vcpkg] add environment variable VCPKG_OVERLAY_PORTS

* add documentation for VCPKG_OVERLAY_PORTS

* append env overlay instead of prepending to give explicitly listed overlays priority

* fix formating (manually)

* manually fixing formating

* improve help text

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2020-08-05 11:21:42 -07:00
Jonathan Hale
5e40afca0d
[corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (#12211)
* [magnum] Improve maintainability of feature to cmake flag conversion

* [magnum] Ignore features not supported on current platform

Allows `vcpkg install magnum[*]` on any platform.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add cglcontext and windowlesscglapplication features

* docs: Update valid VCPKG_CMAKE_SYSTEM_NAME values

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Replace deprecated basisu with archive download

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add meshoptimizersceneconverter feature

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Also use vcpkg_check_features

Analog to magnum port.

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06

Signed-off-by: Squareys <squareys@googlemail.com>

* [meshoptimizer] Add initial port

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Replace meshoptimizer download with feature dependency

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade,magnum-*] Fix license installation command

Signed-off-by: Squareys <squareys@googlemail.com>

* [meshoptimizer] Use vcpkg_fixup_cmake_targets

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-07-14 08:38:18 -07:00