Commit Graph

600 Commits

Author SHA1 Message Date
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
nicole mazzuca
b2544fd780
[vcpkg_download_distfile] fix download while in manifest mode (#18283)
When vcpkg detects a manifest root, it attempts to take a filesystem lock;
this is a bug in `x-download`.
We fix this bug by disabling manifests.
2021-06-05 09:45:39 -07:00
Matthias C. M. Troffaes
bec883fef4
[doc] document vcpkg_fixup_pkgconfig merging behaviour (#18091)
* [doc] document vcpkg_fixup_pkgconfig merging behaviour

* [doc] add source
2021-06-04 16:49:02 -07:00
Pratik Chowdhury
750c0bdc90
[docs] vcpkg_from_github beast moved to boost-beast (#18106) 2021-06-04 16:48:54 -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
huangqinjin
04b6a4b927
[vcpkg/scripts/make] correct linker flag name (#17084)
* [vcpkg/scripts/make] correct linker flag name

* Trigger CI
2021-06-03 14:56:25 -07:00
Kai Pastor
4386dda0e0
[vcpkg] Don't override pkg-config prefix (#17205)
* Don't override pkg-config prefix

* Rebuild
2021-06-03 14:55:50 -07:00
Martin Vejdarski
385bd9b1ed
[vcpkg_install_gn] Fix variable name typo (#18186) 2021-06-02 15:42:18 -05:00
Christian Rendina
9d7244f2f6
[python3] Update to 3.9.5 (#17773)
* [python3] update to 3.9.5

* [vcpkg] update baseline

* [scripts] update to py 3.9.5
2021-05-26 15:09:28 -07:00
Alexandre Bique
37a5a94f48
[meson] fix build_machine (#17845) 2021-05-26 14:00:07 -07:00
huangqinjin
fbbadfc1ce
[vcpkg/scripts/make] determine whether to use automake wrappers (#17215) 2021-05-26 13:48:41 -07:00
nicole mazzuca
0e914ba681
[scripts-audit] Rollup 2021-05-21 (#18112)
* [scripts-audit] vcpkg_acquire_msys (#17687)

* [vcpkg.cmake] Change find_package function -> macro in order to shorten trace (#17997)

switch from function to macro

* [scripts-audit] z_vcpkg_apply_patches (#18013)

* [scripts-audit] z_vcpkg_escape_regex_control_characters (#18013)

* [scripts-audit] vcpkg_fail_port_install (#18054)

Note that this change allows existing failures;
it changes MATCHES to STREQUAL, meaning that
vcpkg_fail_port_install(ON_ARCH "arm") now succeeds on arm64;
this change in behavior is fine (IMO) since it strictly succeeds
when it used to fail.
2021-05-26 13:40:48 -07:00
Kai Pastor
df34b02e52
[vcpkg] Fix lib uuid handling for x64-mingw-dynamic (#17137)
* Link static uuid on MiNGW

* Trigger rebuild
2021-05-26 09:13:16 -07:00
Kai Pastor
43ae0c9f9e
[vcpkg_fixup_pkgconfig] Fix handling of empty fields (#17898) 2021-05-24 16:22:40 -07:00
Kai Pastor
44da6b78fc
[vcpkg_configure_make] Don't create empty elements in include path vars (#17970) 2021-05-24 15:47:44 -07:00
pastdue
449b85b1e5
vcpkg_configure_meson: mingw build fix (#18026) 2021-05-24 15:09:58 -07:00
k1ee
38a0efba5b
Update proxy failure hint (#17761)
* Update proxy failure hint

* Format

* Format

* Format

* Retry checks
2021-05-21 01:00:41 -07:00
nicole mazzuca
cae98beb1b
[scripts-audit] simple msbuild-buildsystem changes (#17779)
* [scripts-audit] simple msbuild-buildsystem changes

* warn on extra args in vcpkg_clean_msbuild

* fix variable name, and quotes expansion

* ROOT_INCLUDES -> root_includes
2021-05-17 11:08:42 -07:00
nicole mazzuca
253c561a2c
[scripts-audit] gn buildsystem (#17776)
* [scripts-audit] Remove vcpkg_build_gn

This command has never been used (git log -S"vcpkg_build_gn\("
gives no results outside of the file itself and docs)
and so shrink the public interface surface

* [scripts-audit] gn buildsystem

* format

* oops

* aaaugh

* cr
2021-05-17 11:08:33 -07:00
Christian Rendina
104b3c7625
[Python2 ]Update to 2.7.18 (#17798)
* [Python2] Update to 2.7.18

* [vcpkg] update baseline
2021-05-13 13:13:54 -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
autoantwort
f44d4c169f
[docs] link to new functions in deprecated warnings (#17179)
* [docs] link to new functions in deprecated warnings

* [docs] add deprecation messages to portfile-functions.md

* [docs] also update documentation in .cmake files

* [docs] introduce new directive DEPRECATED BY in the documentation generation script and use that directive

* Trigger Build

* Trigger Build

* Trigger Build
2021-05-09 10:47:21 -07:00
Alexander Neumann
b93b4c4ef0
[tool-meson] update to 0.58 (#17631)
* update meson to latest

* version stuff

* update meson to 0.58

* reset version stuff

* version stuff

Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
2021-05-06 07:32:53 -07:00
autoantwort
af5b5d3659
vcpkg_configure_make: Add support for linux -> windows cross compilation (#17073)
* vcpkg_configure_make: Add support for linux -> windows cross compilation

* vcpkg_configure_make: Merge some logic

* vcpkg_configure_make: add TODO comment

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build

* Trigger Build
2021-04-30 11:26:05 -07:00
Kai Pastor
37548049a8
Add /etc/fstab in order to remove /cygdrive/ prefix (#17138)
* De-duplicate MSYS2 PATH_TO_ROOT construction

* Create MSYS2 /etc/fstab
2021-04-30 11:24:19 -07:00
Qingnan Duan
5220830089
Remove a ')' character in the documentation (#16515)
* Remove extra )

* fix doc

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-04-28 18:03:43 -07:00
Ahmed Yarub Hani Al Nuaimi
fe25e8ede8
[aws-cpp-sdk] [zlib] [openssl] [curl] Fix zlib, OpenSSL, curl and AWS SDK for Android (#15725)
* Fix Android build

* Add versioning support

* Disable building tests for cURL

* Fix patch file

* Fix patch file

* Fix patch file

* Fix versioning

* Fix patch file

* [aws-sdk-cpp] Update patch

* update baseline

* Fix dependencies

* Simplify Android configuration

* Simplify Android configuration

* Simplify Android configuration
Add alternative Git CMake script

* Bump port version

* Bump version files

* Remove redundant file

* Bump port version

* Fix version files

* Do not build curl, zlib and OpenSSL

* Typo de pkgconfig script

* Fix cURL build for Android

* Add required flags

* Revert macro change

* Fix curl build for other platforms

* Fix curl build for other platforms

* [vcpkg baseline][gsoap] Update to 2.8.111

* Update versions

* [ktx/otl] Update download hash

* update version record

* Fix curl build for other platforms

* Update ports/aws-sdk-cpp/portfile.cmake

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

* Update ports/aws-sdk-cpp/portfile.cmake

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

* Remove FingGit

* Fix configuration step

* Bump cURL port version

* Bump cURL port version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Bump AWS SDK C++ version

* Update ports/curl/CONTROL

* Update ports/curl/portfile.cmake

* update baseline record

* Fix Git

* update version record

* Typo

* Fix cross-platform builds of OpenSSL on MinGW/Windows

* Update version

* Fix version

* update doc

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/aws-sdk-cpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Add debug libraries to curl for Android
Simplify OpenSSL patch for curl
Update OpenSSL's port version

* Update aws-sdk-cpp, curl, and OpenSSL versions

* Fix libssh after latest update

* Update libssh version

* Update libssh version

* Update ports/libssh/portfile.cmake

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

* Update ports/curl/portfile.cmake

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

* Update ports/libssh/portfile.cmake

* Apply suggestions from code review

* Use correct variables for OpenSSL libraries when building curl for Android
Fix zlib building for Android
Remove redundant patch comments

* Bump zlib's port version

* Update zlib, libssh, and curl versions

* [vcpkg baseline][popsift] Fix vcpkg_find_cuda.cmake path

* update version record

* Update versions/o-/openssl.json

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

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-04-19 17:08:51 -07:00
Yury Bura
047525cc04
[scripts] Fix Perl download link (#17102)
* fix strawberryperl download link

* Update scripts/cmake/vcpkg_find_acquire_program.cmake

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

Co-authored-by: Adam Johnson <AdamJohnso@gmail.com>
2021-04-12 17:55:53 -07:00
autoantwort
e8b9eca6b1
fix VCPKG_CROSSCOMPILING (#17068) 2021-04-07 12:51:40 -07:00
huangqinjin
64efdb4658
[vcpkg/scripts/make] add compiler tools to PATH (#17085)
* [vcpkg/scripts/make] add compiler tools to PATH

* use find_program to check if tools are already in PATH
2021-04-07 12:41:56 -07:00
Alexander Neumann
92a3c70f1d
[vcpkg/make/scripts]only append the lib directories if they exist. (#16959)
* [vcpkg/make/scripts]only append the lib directories if they exist.

* fix path concat
2021-04-02 13:41:17 -07:00
Robert Schumacher
7aa11380a5
[vcpkg_acquire_msys] Update package versions (#16952) 2021-04-02 13:37:46 -07:00
Alexander Neumann
42c437bb33
[vcpkg/scripts] add variable VCPKG_CROSSCOMPILING (#16900)
* add VCPKG_CROSSCOMPILING

* update docs

* Apply suggestions from code review

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

* update docs

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-04-02 12:51:05 -07:00
Ilya Arzhannikov
25d26e7594
[vcpkg_build_make] pass no parallel command to execute_process when parallel build is disabled (#17018)
Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
2021-04-02 12:40:16 -07:00
autoantwort
c02feb90c2
vcpkg_copy_tool_dependencies: show description how to install powershell (#16347) 2021-04-01 10:39:35 -07:00
Alexander Neumann
2779b733c2
[vcpkg/scripts] add a way to define another tool destination (#16935) 2021-03-31 12:47:35 -07:00
Alexander Neumann
8646c6587b
[vcpkg/meson] fix some details (#15756)
* [vcpkg_install_meson] add bin to path to run code generators

* [vcpkg_configure_meson]
deactivate native compiler in cross builds
make x86 on x86_x64 a native instead of a cross build
(as long as we are not building for UWP)

* remove double spaces in _FLAGS
remove unnecessary comments

* change regex to take double - into account.

* add missing removal of multiple spaces back into the regex

* remove ws diff change

* remove ws to reduce diff

* Change macro to function

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* UWP is cross target.

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-03-31 11:54:44 -07:00
Rich Logan
2bc10eae2f
[openh264] Add openh264 port (#16714)
* Add openh264 port

* Fixes for CI

* Don't build tests

* Add git dependency

* Update gas-preprocessor

* Update gas subfolder name

* No UWP support for meson builds

* Manifest format

* Update ports/openh264/vcpkg.json

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

* Update versions

* [openh264] Tweak precise tool dependencies

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-03-22 15:58:34 -07:00
autoantwort
7497632773
[scripts] vcpkg_configure_make: do not set --build on macOS (#16596)
* [scripts] vcpkg_configure_make: do not set --build on macOS

* [scripts] vcpkg_configure_make: do not set --host on macOS
2021-03-22 15:40:23 -07:00
Robert Schumacher
abcc05fde5
[vcpkg_build_make] Fix interaction with Windows Detours (#16775) 2021-03-18 15:48:57 -07:00
Jack·Boos·Yu
38b9e63dea
[vcpkg_execute_build_process] Add warning message when memory or hard disk space is insufficient (#16633)
* [vcpkg_execute_build_process] Add warning message when memory or hard disk space is insufficient

* Update scripts/cmake/vcpkg_execute_build_process.cmake
2021-03-16 11:52:25 -07:00
Wedge009
9431133cd5
[vcpkg_acquire_msys] Add tar support for gettext (#16312)
Windows 10 has native support for tar but older Windows do not. Add tar dependency for gettext, which requires tar when running autopoint.

Resolves #15508.
Resolves #14830.
2021-03-15 17:56:11 -07: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
nicole mazzuca
c47216ac79
[vcpkg_*_cmake] remove deprecation message (#16480)
* [vcpkg_*_cmake] remove deprecation message

to be replaced by a note in the maintainer-guide
this allows existing ports to build without warnings, so as to avoid warning people unnecessarily,
while still making sure people update when they update ports.

* Update docs/maintainers/maintainer-guide.md
2021-03-02 17:03:34 -08:00
nicole mazzuca
3426db05b9
[scripts-audit] Rollup PR 2021-02-26 (#16440)
* [scripts-audit rollup] PR #16419

* pull the cmake doc comment parsing out into its own function
* support cmake helper ports
* add real support for deprecation, as opposed to ad-hoc

* [scripts-audit rollup] PR #16192

* add a z_ in front of internal functions
* move internal functions out

set feature_vars again in parent scope

* [scripts-audit rollup] PR #16309

Audit vcpkg_copy_pdbs

* [scripts-audit rollup] PR #16304

* Fix usage, documentation

* [scripts-audit rollup] PR #16393

* [scripts-audit rollup] PR #16377

Deprecate `vcpkg_*_cmake` in favor of `vcpkg_cmake_*` from the
`vcpkg-cmake` port, as well as `vcpkg_fixup_cmake_targets`
in favor of `vcpkg_cmake_config_fixup` from the
`vcpkg-cmake-config` port.
2021-02-28 13:17:19 -08:00
Adam Johnson
0daf0111b2
[python3] upgrade to 3.9.2 (#16315)
* [python3] Update to 3.9.2.

* x-add-version
2021-02-24 14:01:02 -08:00
Jesse Towner
a037d82649
[vcpkg] vcpkg_configure_meson: cross-compile fixes for Android (#16260)
* [vcpkg] vcpkg_configure_meson: cross-compile fixes

This change includes two fixes to the meson cross-compile config.

The first change fixes the regex used to partition linker flag
options so that it supports double-hyphen prefixes.

The second change ensures that the cross file is always generated
when the target platform is either Android or iOS, even if the
host and target CPU architectures are the same.

* Use helper function instead of regex replace

Use vcpkg_internal_meson_convert_compiler_flags_to_list to partition
compiler flags into a list, instead of string(REGEX REPLACE ...).
2021-02-20 21:29:35 -08:00
nicole mazzuca
1bb5ea10a3
[scripts-audit] vcpkg.cmake (#16061)
* [vcpkg.cmake] modify to get in line with the audit

See PR #16055

This also (attempts to) allow vcpkg.cmake to run with cmake 3.0; we had
a VERSION_GREATER_EQUAL check, but that if keyword was added in cmake
3.7.

* s/target_name/package_name in find_package

* depend on z_vcpkg_function_arguments

instead of a custom macro
also, as a drive-by, switch to foreach(X IN LISTS ...)

* split the utility macros/functions out

additionally, move the options and settings to the top of the file

* move more options and settings to the top

* fix name of file

* fix ras code comments

* remove z_vcpkg_utilities due to export
* add cmake_policy(PUSH|POP)
* add VCPKG_INSTALLED_DIR input variable
* add .cmakestamp to vcpkg_installed

* fix osx ifs to use quotes

also, remove spaces between if and (, to keep style consistent
(mostly for ease of grepping...)

* fix bug fixed by #16193

* move z_vcpkg_add_fatal_error up

* fix RANGE for reals
2021-02-18 16:27:47 -08:00
nicole mazzuca
f3a4d1aeb7
[scripts audit] ports.cmake (#16257)
* [scripts audit] ports.cmake

* [testing] modify triplet files to test all ports
2021-02-18 14:27:41 -08:00
nicole mazzuca
c3ef5d181b
[scripts-audit] vcpkg_add_to_path (#16189)
* [scripts-audit] vcpkg_add_to_path

* regenerate docs
2021-02-17 10:08:50 -08:00