Commit Graph

824 Commits

Author SHA1 Message Date
Kai Pastor
66444e13a8
[vcpkg_find_acquire_program(PKGCONFIG)] Switch to pkgconf, add arm64 (#31924)
* [vcpkg-ci-msys2] Add clangarm64 support

UCRT binaries for ARM64, built with clang.

* [vcpkg_find_acquire_program(PKGCONFIG)] Switch to pkgconf, add arm64

* CI
2023-06-12 16:31:42 -07:00
Kai Pastor
ef97891996
[vcpkg_find_fortran] Update msys2 packages (#31926)
* [vcpkg_find_fortran] Update msys2 packages

* [vcpkg-ci-msys2] Process x86 gfortran on x64
2023-06-12 16:29:54 -07:00
Billy O'Neal
638b1588be
Update vcpkg-tool to 2023-06-07 + xbox triplets cleanup (#31723)
* Update vcpkg-tool to 2023-05-31 + xbox triplets cleanup

https://github.com/microsoft/vcpkg-tool/releases/tag/2023-05-30 +
https://github.com/microsoft/vcpkg-tool/releases/tag/2023-05-31 +
https://github.com/microsoft/vcpkg-tool/releases/tag/2023-06-07

Clean up xbox triplets following teaching vcpkg.exe about xbox more directly.

Also deletes the seemingly-no-longer-used vcpkg_get_dep_info.cmake and vcpkg_get_tags.cmake.

Also: [redis-plus-plus] Add DISABLE_PARALLEL_CONFIGURE due to source tree write.
2023-06-08 11:17:29 -07:00
Kai Pastor
1c5a340f6e
[vcpkg_acquire_msys,vcpkg-ci-msys2] Ensure msys2 package list freshness (#29067)
* [vcpkg-ci-msys2] New test port for msys2 freshness

* Add features for script updates

* Remove duplicate libbz2 entry

* Automatically update all msys packages, add autoconf-wrapper

* Update primary URL and mirrors

* Follow repo renames

* Fix dependencies of 'file'

* Resolve dependencies at runtime

Don't require msys2 packages to be order from dependent to independent.
This allows to directly use the packages official dependencies, even
if they contain cycles.
It also allows to maintain a stable alphabetical order of the package
declarations, even if the dependencies change over time. This helps to
avoid duplicate declaration.

* Fix updating

* [gettext] Preset more MSVC checks

* Update msys2 packages

* gettext fixes

* CI

* Simplify: Remove update-critical

Desired changes can be picked in git gui etc..

* PKGCONFIG moved

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-05-28 23:24:09 -07:00
autoantwort
a0a828827b
[libgpg-error] fix arm64 build | [configure_make] fix arm host detection (#30490)
* [vcpkg_configure_make] Do not use dfferent names arm64

* Trigger Build

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
2023-04-19 14:35:20 -07:00
Billy O'Neal
fb0e86eb02
Revert "[scripts] Update Bazel to 6.1.2 (#30668)" (#30958)
This reverts commit 2514625831.
2023-04-18 18:45:23 -07:00
sbrajchuk
2514625831
[scripts] Update Bazel to 6.1.2 (#30668) 2023-04-18 18:44:25 -07:00
Kai Pastor
b08025687f
[vcpkg_find_acquire_program] Split out data (#30780) 2023-04-14 02:19:52 -07:00
Mengna Li
69efe9cc2d
update runtime version (#30546) 2023-03-31 21:00:54 -07:00
Kai Pastor
9b9c2758ec
[vcpkg_configure_meson] Update compiler flags parsing (#30271) 2023-03-20 11:45:02 -07:00
Kai Pastor
66372e84ae
Use msys2 bash regardless of target and of Windows Apps (#30172)
* Use msys2 bash regardless of target

* Insert msys root before Windows Apps

* Fix WindowsApps path
2023-03-20 00:04:15 -07:00
Kai Pastor
5da7b20588
[vcpkg_fixup_pkgconfig] Fix quoting (#29792)
* [unit-test-cmake] Check pkgconfig quoting

* [vcpkg_fixup_pkgconfig] Fix quoting
2023-03-14 17:07:19 -07:00
Kai Pastor
73b9a2a359
[openssl,vcpkg-cmake-get-vars] Fix android and emscripten, add feature tools (#29966)
* [vcpkg-cmake-get-vars] Call 'project' early

System variables like 'APPLE' or 'ANDROID' aren't set before 'project()'.

* Get Android variables

* [openssl] Ensure that compiler is reached via 'PATH'

* Fix Android configuration

* Add 'tools' feature

* Update versions

* [openssl] Initialize android with vcpkg settings

* [openssl] Really don't build apps

* [vcpkg-cmake-get-vars] Update android vars

* [libpq] Pass openssl version from pkgconfig

* [vcpkg-cmake-get-vars] Update android vars

* [vcpkg-cmake-get-vars] Report generator

* [vcpkg-cmake-get-vars] Escape all output

* Transfer cmake-get-vars fixes

* Transfer cmake-get-vars extra flags

* no-asm for android-arm w/o neon

* [vcpkg_configure_make] Unquote as needed

Toolchain flags are passed into make via environment variables (e.g.
CFLAGS) and expanded by Makefiles regardless of quotes. And even vcm's
internal handling isn't prepared for these quotes. So we must remove
the early. This doesn't interfere with properly escaped quotes.

* Re-add lost 'project', amends 4cf7caaa

* [openssl] Fix emscripten
2023-03-14 14:11:06 -07:00
jre-lsft
cfdeb75bb6
Restore environment after make to avoid mixing-up linker flags (#29984)
Fixes #29983.
2023-03-13 15:02:32 -07:00
Todor Prokopov
82e03905f5
[qt5] MinGW build fixes (#29505)
* [qt5] MinGW build fixes

* [qt5] Remove e-mail headers from mingw9.patch

* [qt5] Run vcpkg x-add-version

* Cleanup qt5-base icu libs setup

Windows-shared needs different options. Patch obsolete.

* Check early for mingw32-make

* Revise make install path fixup

---------

Co-authored-by: Kai Pastor <dg0yt@darc.de>
2023-02-22 13:17:37 -08:00
Kai Pastor
36fb23307e
[vcpkg_configure_make] Fix almost-native builds (#28760)
* [gmp] Set CCAS for native builds

* [vcpkg_configure_make] Move triplet detection

* [vcpkg_configure_make] Control cross tools by autotools triplet

* Update versions

---------

Co-authored-by: MonicaLiu <v-liumonica@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
2023-02-10 12:02:13 -08:00
reito
9d07914638
[vcpkg] fix proxy hint that should be fixed long time ago (#29346)
* fix proxy hint that should be fixed long time ago

* rebase master
2023-02-08 13:51:10 -08:00
reito
75381ea7fa
[gn-related-ports] Fix gn based projects build error on Windows (#29058)
* fix gn path error on windows

* add quotes

* vcpkg cmake guidelines

* Fix version database.

* Use Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL instead of WARNING

* Quotes 🤦

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-01-26 18:53:54 -08:00
Aleksi Sapon
50805d6ece
Add support for different LFS url to vcpkg_from_git (#28693) 2023-01-23 16:26:29 -08:00
Matthew Oliver
19b64e8b9e
[nasm] Update to 2.16.01. (#28950)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-01-19 18:43:57 -08:00
Robert Coup
38364cede1
always strip whitespace when calling uname -m (#28939) 2023-01-19 18:39:39 -08:00
Kai Pastor
edcf949452
[vcpkg_fixup_pkgconfig] Check for more problems, add unit test (#23898)
* Print stack traces for failed unit tests

* Add test for vcpkg_fixup_pkgconfig.cmake

* Check for 'optimized' and 'debug' in pc files

* Check for 'NOTFOUND' and for 'ns::target' in pc files

* Check for, and fix, line continuations

* Test file path substitutions

* Move contents processing into separate function

* Update and leverage line break normalization

* Pass prefix to data processing

* Validate only the collapsed Libs

* Test removal of '<field>.private'

* Declare unit test license (same as vcpkg)

* Replace ';' with ' ' in 'Libs:'

* Disambiguate parameter variable names

* Test quoting of variables

* Fix quoting of variables

* Quote whole parameters

* Process and quote libs item-wise

* Resolve keywords 'optimized', 'debug', 'debug'

* Consistency

* CI [skip actions]

* CI [skip actions]

* Don't fail on detected errors

* Disable unit-testing for fatal errors

Co-authored-by: Billy O'Neal <bion@microsoft.com>
2023-01-19 18:27:29 -08:00
Robert Schumacher
24c85bacab
[vcpkg_configure_cmake] Partially revert #26959 (#28483)
We must avoid significant breaking changes to the sets of scripts coupled to the vcpkg tool version.
2023-01-18 11:44:24 -08:00
JonLiu1993
fd766eba2b
[vcpkg] update msys-libtool version (#28919)
* [vcpkg] update msys-libiconv versio

* [vcpkg] update msys-libtool version
2023-01-16 12:30:37 -08:00
reito
5b76887a11
update gas-preprocessor and clang in vcpkg_find_acquire_program (#28467)
Co-authored-by: Cheney-Wang <850426846@qq.com>
Co-authored-by: FrankXie <v-frankxie@microsoft.com>
2023-01-11 23:24:44 -08:00
autoantwort
0960ce8c46
vcpkg_execute_build_process.cmake: Check if the exit code is a string (#28405)
Co-authored-by: Cheney-Wang <850426846@qq.com>
2023-01-11 16:13:00 -08:00
Kai Pastor
55c29f1dca
[scripts|world rebuild] Disambiguate saved log files (#26754)
* Disambiguate saved log files

* CI [skip actions]

* CI [skip actions]

* CI [skip actions]

* Use ALIAS keyword instead of auto-numbering

* Update versions
2023-01-09 11:13:59 -08:00
Alexander Neumann
45e66bff9b
[scripts|vcpkg_configure_make] Help C(XX)FLAGS survive through libtool (#28349)
* help cflags survive through libtool

* Guard -Xcompiler in case of gcc/gnu

since it doesn't like unknown compiler flags.

* export CMAKE_<lang>_COMPILER_FRONTEND_VARIANT from cmake

* v db and script changes

* also check compiler id

Co-authored-by: Cheney-Wang <850426846@qq.com>
2023-01-07 01:04:32 -08:00
Osyotr
8b9ebdccdf
[vcpkg_configure_make] Respect host triplet when determining --build (#28331)
Co-authored-by: Cheney-Wang <850426846@qq.com>
2023-01-07 01:01:31 -08:00
Lily Wang
9033fcdf28
[vcpkg baseline][marisa-trie] Fix conflict file include/Makefile.am with hunspell (#28352)
* [vcpkg baseline][marisa-trie] Fix conflict file include/Makefile.am with hunspell

* x-add-version

* update vcpkg_install_msbuild.cmake

* x-add-version

* update vcpkg_install_msbuild.cmake

* update vcpkg_install_msbuild.cmake

* update vcpkg_install_msbuild.cmake

Co-authored-by: Jonliu1993 <13720414433@163.com>
2023-01-04 12:11:05 -08:00
Kai Pastor
56765209ec
[vcpkg_clean_executables_in_bin] Clean bundles (#28335) 2022-12-14 18:23:44 -08:00
Kai Pastor
f11bad8304
[vcpkg_configure_gn] Remove build dir before configure (#28006) 2022-11-28 09:58:38 -08:00
Adam Johnson
5599ae4ccf
[python3] Bump to 3.10.7 (#27558)
* [python3] Make patch files contiguous.

When applying these back to the python3 repository and re-formatting,
the gap in patch file numbers requires annoying manual renaming. Debunk
that.

* [python3] Use patch files, not diffs.

Diffs require multiple steps to import into the python3 repository.
Debunk that. The patch format retains authorship information.

* [python3] Fix problems with conflicting patches.

Something modified in the static library patch was being used as a
context line in a later patch. How did this pass CI?

* [python3] Bump to 3.10.7.

* [python3] Fix Windows 7 patch.

* [python3] Back out trivial patch changes.

* [python3] Apply unconditional patches first.

* version things and stuff

* Bump Python tools to 3.10.7.
2022-11-18 11:53:08 -08:00
Kai Pastor
895072c824
[vcpkg_build_make] Correctly use arg_OPTIONS, not arg_MAKE_OPTIONS (#27675)
* Correctly use arg_OPTIONS, not arg_MAKE_OPTIONS

* CI
2022-11-11 10:33:51 -08:00
Aleksi Sapon
57ae838ee8
Add optional LFS support to vcpkg_from_git (#27461) 2022-11-07 07:55:41 -08:00
Thomas1664
c5fb4ecf7f
[vcpkg-tool][world rebuild] Enable FETCHCONTENT_FULLY_DISCONNECTED (#26959)
* Enable FETCHCONTENT_FULLY_DISCONNECTED

* Bump version

* version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-11-03 14:59:31 -07:00
Kai Pastor
3e35cb0a15
[scripts|nmake] Add jom option, add language control (#27255)
* Add CL_LANGUAGE option

* Add PREFER_JOM option

* Append install target to targets, not options

* Update vcpkg_install_nmake

* Re-enable nmake UWP builds for C projects

* Use PREFER_JOM

* Update documentation

* Update versions

* Add license fields

* Update versions
2022-11-02 11:32:43 -07:00
Kai Pastor
a1af533095
[scripts] Fix meson for mingw (#27380)
* Fix mingw

* Remove invalid transformation

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-10-25 20:50:13 -07:00
Alexander Neumann
4aac676746
[qt5] Fix pkg-config setup in qt5-base (#27404)
* [qt5] fix pkg-config search path and save qmake config.log

* v db
2022-10-24 16:23:22 -07:00
Alexander Neumann
d8e60ef474
[vcpkg scripts] Crosscompiling fixes (#26617)
* test osx stuff

* deactivate most of ci

* get trace output

* add required flags to the linker flags

* also look for --sysroot

* Link_args are always shared

* fix ar flags

* setup FOR_BUILD vars.

* try tricking the build.... but man configure scripts are stupid sometimes...

* try 2

* major meson rewrite

* fix duplicates

* revert --trace-expand

* update port version

* revert pipeline changes

* v db

* bump version

* v db

* set flags for rc compilers

* a few more ios fixes.

* v db

* fix osx/ios logic

* documentation and don't fatal_error in build/host machine entry calculation.

* add android/compiler target stuff from #26570

* remove extra endif

* v db

* add target param to linker flags.

* target in cpp flags

* Make vcpkg-cmake-get-vars more ios compatible

* Update scripts/get_cmake_vars/CMakeLists.txt

Co-authored-by: Matthias Kuhn <matthias@opengis.ch>

* More ios fixes

* fix target adding

* Fix broken loop

* v db

* v db

* bump date

* v db

* v db

* v db

* remove port-version 1

* v db

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias Kuhn <matthias@opengis.ch>
2022-10-13 09:40:52 -07:00
day253
11967e7797
[vcpkg] GENERATOR with Makefiles can build parallel (#26780)
* GENERATOR with Makefiles can build parallel

* resolved conflicts

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-10-08 21:48:41 -07:00
Kai Pastor
27b04e77aa
[scripts|world rebuild] Retry 'make install' in non-parallel mode (#27105)
* Retry 'make install' in non-parallel mode

* CI [skip actions]
2022-10-08 21:36:46 -07:00
pastdue
5f14417300
vcpkg_configure_meson: Support wasm32-emscripten triplet (#26317)
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-09-30 17:23:42 -07:00
Vladimir Serdyuk
b92daebd09
[scripts] fixes for armv7l host builds (#26510)
* [scripts] fixes for armv7l host builds

* [scripts] fix meson for 32-bit arm

* [scripts] replaced EXEC_PROGRAM with execute_process in ninja and pathelf paths in vcpkg_find_acquire_program
2022-09-30 17:22:06 -07:00
Alexander Neumann
ba1f91fd7e
[scripts|cmake] use ENV{VisualStudioVersion} to switch cmake generator (#26339)
* add VCPKG_CMAKE_VS_GENERATOR for overriding/providing a generator if ninja cannot be used

* Wording CR.

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>

* use VisualStudioVersion to switch the generator.

* v db

* CR changes

* v db

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
2022-09-22 14:28:20 -07:00
Dawid Wróbel
4340582bc3
[vcpkg_acquire_msys] add 'which' package to default set on Windows (#26618)
* [vcpkg_acquire_msys] add 'which' package

* [vcpkg_configure_make] add 'which' to default msys packages on Windows

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-09-19 14:00:14 -07:00
Alexander Neumann
f2453e0619
[Qt5|qmake] pass toolchain setup (#26354)
* [qt5/qmake] Pass toolchain flags to build

* v db

* forgot a dependency

* v db

* add required ar flags

* v db

* Apply suggestions from code review

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>

* v db

* inc port version

* v db

* qt5-base

* v db

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
2022-09-12 13:30:47 -07:00
pastdue
0e9a28874c
Add VCPKG_TARGET_IS_EMSCRIPTEN, fix opus and libsodium ports for wasm32-emscripten (#26318)
* vcpkg_common_definitions: Add VCPKG_TARGET_IS_EMSCRIPTEN

* [opus] Fix wasm32-emscripten builds

* [libsodium] Fix wasm32-emscripten builds

* Run x-add-version
2022-09-08 14:01:20 -07:00
Russell Greene
5ace90c530
[scripts] Set VCPKG_TARGET_BUNDLE_SUFFIX to .app for iOS to allow for tools building more cleanly (#26612) 2022-09-01 09:25:11 -07:00
Alexander Neumann
f688b2e296
[vcpkg] add updated compile wrapper for clang-cl (#26340)
* add updated compile wrapper for clang-cl

* patch msys instead of adding the complete wrapper

* remove doubled line

* fix issue with direct packages
2022-08-29 17:30:53 -07:00
Alexander Neumann
624f1b4eca
[jemalloc|vcpkg_configure_make] update and some script fixes (#25009)
* WIP commit

* more jemalloc wip

* v db

* add license

* v db

* apply format diff

* fix script

* WIP commit

* fix ARFLAGS for the wrapper

* CR stuff

* v db

* use separate_arguments to add -Wl, to linker flags

* say "-Xlinker" three times and it will come.

* make assembler compile only.

* disable _FOR_BUILD if crosscompiling.
use function instead of macro.

Remove AS settings

* ignore settings for osx until somebody knows how to fix it.

* CR z_vcpkg_make_set_env

* CI retrigger

* make conflicting options an error

* remove DEFINED since the options are always defined
2022-08-19 15:13:23 -07:00
Alexander Neumann
ef9628f449
[vcpkg script] build_nmake use z_vcpkg_get_cmake_vars (#25862)
* use z_vcpkg_get_cmake_vars instead of including the toolchain

* fix typo

Co-authored-by: Osyotr <Osyotr@users.noreply.github.com>

* add supports expressions

* use _ENV_ instead of ENV so vcpkgs flags will overwrite any other flags.
(also fixes pdcurses using LINK)

* v db

* version

Co-authored-by: Osyotr <Osyotr@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-08-19 15:12:14 -07:00
Cheney Wang
a68c22c9a7
[vcpkg] Fix typo (#26388) 2022-08-18 10:38:09 -07:00
Alexander Neumann
dc9d737351
[pixman] add missing include and fix clang-cl build (#26186)
* pixman: add missing include and fix clang-cl builds

* v db

* use correct <> isntead of ""

* v db

* make the patch depend on _MSC_VER

* v db

* fix bug in vcpkg_configure_meson not linking WindowsApp.lib
fix another bug that system=windowsstore which meson doesn recognize

* bump port version

* v db
2022-08-17 12:36:12 -07:00
autoantwort
9b618499f6
[vcpkg_from_gitlab] improvements (#23568)
* [vcpkg_download_distfile] Don't check downloaded file when ALWAYS_REDOWNLOAD is passed

* [vcpkg_from_github] fix error message and correctly set VCPKG_HEAD_VERSION

* [vcpkg_from_gitlab] Use gitlab api instead of git ls-remote

* no change

* Apply suggestions from code review

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
2022-08-12 15:32:07 -07:00
Billy O'Neal
ae76307e4b
Audit use of TO_NATIVE_PATH. (#26201)
* Audit use of TO_NATIVE_PATH.

TO_NATIVE_PATH should only be used when (1) pasting a path into a command line, or (2) displaying a path to a user. It must not be used before calling other CMake operations like file(WRITE.

Fixes https://github.com/microsoft/vcpkg/issues/26178

ports/ffmpeg/portfile.cmake:
Both uses are being embedded into a command line 

ports/gdal/dependency_win.cmake
117: This used TO_NATIVE_PATH but didn't actually connect the result. It's going on a command line so TO_NATIVE_PATH is appropriate.
Drive by: Added quotes around other uses (all of which seem to be going to command lines).
202: ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL} don't seem to be set even though they are used; I think this is wrong but I don't know for sure that it is so I'm leaving it alone for now.

ports/msmpi/portfile.cmake
All 3 uses are being embedded into a command line 

ports/jemalloc/fix-utilities.patch
ports/libproxy/fix-dependency-libmodman.patch
ports/qtbase/env.patch
These are in upstream content / context so it is not edited.

ports/opengl/portfile.cmake
Broken! Drive by fixes:
* Modernized checking VCPKG_BUILD_TYPE
* Ordered things consistently to be release then debug.
* Removed funny newlines.

ports/openni2/portfile.cmake
Borderline OK; it goes into an MSBuild / vcxproj. I'm leaving it alone. Drive by fixes:
* Guarded debug-only copies for VCPKG_BUILD_TYPE
* Fixed supports expression

ports/openssl/unix/CMakeLists.txt:
Unused!

ports/pthreads/portfile.cmake:
Both uses are being embedded into a command line 

ports/qt5-base/cmake/qt_fix_makefile_install.cmake
I'm not sure if this one is OK but it's being embedded into a file so it's probably fine.

ports/qtapplicationmanager/portfile.cmake:
I'm pretty sure this one is wrong, but it's guarded by VCPKG_TARGET_IS_WINDOWS so the ability to create damage is limited.

ports/readosm/portfile.cmake:
The use is being embedded into a command line 

ports/spatialite-tools/portfile.cmake:
The use is being embedded into a command line 

ports/sqlcipher/portfile.cmake:
Both uses are being embedded into a command line 

scripts/ports.cmake:
Some uses were unused, others are immediately used and printed to the console. 

scripts/buildsystems/vcpkg.cmake:
Fixed :)

scripts/cmake/vcpkg_build_qmake:
Looks unused.

scripts/cmake/vcpkg_build_process.cmake:
Added to console message only. 

scripts/cmake/vcpkg_execute_required_process_repeat.cmake:
Added to console message only. 
Drive by: Fixed typo in variable name in the message.

scripts/cmake/vcpkg_execute_required_process.cmake:
Added to console message only. 

* Fix missing license.
2022-08-12 15:21:20 -07:00
Thomas1664
48369f2a2a
[vcpkg_download_distfile] Make file name more unique (#25607)
* [vcpkg_download_distfile] Add parameter `FILE_DISAMBIGUATOR`

* Add argument checks

* Make unparse args a fatal error

* Remove trailing ;

* Append instead of prepend hash

* Always append commit hash

* Only append file hash if hash differs from already installed file with same name
2022-08-01 15:14:44 -07:00
autoantwort
12a005017b
[dcmtk] no absolute paths (#25964) 2022-07-27 11:41:12 -07:00
Alexander Neumann
d052cd6113
[vcpkg script] Normalize PATH so that insertion of msys paths always works (#25848)
* Normalize PATH so that insertion of msys paths always works

This is required if the PATH variable has been modified and doesn't follow the normal windows style

* make it better

* switch path manipulations. vcpkg wrapper dir needs to come first.
2022-07-25 13:26:12 -07:00
Kai Pastor
49868fd552
[vcpkg-cmake] Update parallel vcpkg_cmake_configure (#21507)
* Revise generator selection

If the host is x86, assume that msbuild is requested for windows.
If msbuild is requested and suitable, use it.
Else if a particular generator is requested, use it.
Else if ninja is available, use it.
Else on non-windows host, use "Unix Makefiles".

* Revise ninja_host detection

* Revise parallel configure detection

* Consolidate ninja path setup

* Update documentation

* Use portable chdir

* [ms-gltf] Use new generator selection

* Update versions
2022-07-25 12:23:04 -07:00
Kai Pastor
687f4aab11
Save meson logs on failure (#25806)
* [vcpkg_configure_meson] Save log files on error

* Document SAVE_LOG_FILES option
2022-07-18 13:21:36 -07:00
Osyotr
42b2876645
[vcpkg] Fixup rpath after building dynamic libraries on linux (#23035)
* Fixup rpath after building dynamic libraries on linux

* Switch back to a single variable VCPKG_FIXUP_ELF_RPATH

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

* Don't force fixup in x64-linux triplet yet

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com>
2022-07-18 12:44:34 -07:00
Jamlys Lee
de176433e9
[meson] Add support for loongarch64 cpu. (#25615)
* Add support for loongarch64 cpu.

* update ci.baseline.txt

* Revert "update ci.baseline.txt"

This reverts commit 0b3f4851bc.

* Allow user to add additional options for meson within custom triplet.

Co-authored-by: Jamlys Lee <jamlys_lee@163.com>
2022-07-17 19:41:15 -07:00
Thomas1664
c69f2b9098
[vcpkg] Add vcpkg_install_copyright() portfile function (#25239)
* [vcpkg tool] Add vcpkg_install_copyright

* Make sure FILE_LIST is provided

* relative to ${SOURCE_PATH}

* Add documentation

* Add to table of contents

* Relative paths was a bad idea.

* Tell users to use the correct way

Co-authored-by: Billy O'Neal <bion@microsoft.com>

* Fix docs

* Add parameter COMMENT

* Rename to vcpkg_concat_copyright

* Fix escape

* Revert "Fix escape"

This reverts commit 53f1636705.

* Revert "Rename to vcpkg_concat_copyright"

This reverts commit 6ce9152a61.

* Fix escape

* Add support for single copyright file

* Update docs

* Make comment less confusing

* [ci skip] Billy CR

* [ci skip] Format

* Remove explicit checks for STREQUAL ""

* Add error msg if file doesn't exist

Co-authored-by: Billy O'Neal <bion@microsoft.com>
2022-07-13 09:41:52 -07:00
Kai Pastor
39b548c8e5
[scripts|world rebuild] Always save config.log and CMakeCache.txt (#25189)
* Always save config.log, even on error

* Always save config.log and CMakeCache.txt[.log]

* Add SAVE_LOG_FILES option

* Make implicit lookups explicit

* Update versions
2022-07-07 14:58:03 -07:00
Kai Pastor
69cd3402c0
[vcpkg_setup_pkgconfig_path] Fix backup/restore (#25361)
* Unit-test vcpkg_backup/restore_env_vars

* Unit-test z_vcpkg_setup/restore_pkgconfig_path

* Fix z_vcpkg_setup_pkgconfig_path env var backup

* Move parent-scoping into vcpkg_backup_env_variables command

* Test repeated restore

* Unset z_vcpkg_backup_env_variables_arg_vars

* Documentation updates

* Inline pkgconfig env vars backup

* Revert obsolete changes

* Fix typo

* Remove duplicate doc file
2022-06-29 14:47:44 -07:00
Juan Carlos Arevalo Baeza
61e686b24c
[vcpkg-cmake] Fix the application of VCPKG_CMAKE_CONFIGURE_OPTIONS with more than one option (#25123)
* Fix the application of VCPKG_CMAKE_CONFIGURE_OPTIONS with more than one option

VCPKG_CMAKE_CONFIGURE_OPTIONS (plural) is meant to be a list of options to be added to a cmake invocation.

But it was being applied quoted, which disallowed it from containing multiple options.
- If it was initialized with a list, cmake would get the options ";"-separated.
- If it was initialized with a blank-separated string, cmake would get the entire astring quoted as a single argument.

The fix is simple: don't (ever) quote arguments to list(APPEND) unless they are really meant to be a single element to append to the list.

* Update the version-date of vcpkg-cmake

* Update hash after rebase

* Fix vcpkg-cmake.json

In my defence, I'm new to this...

Co-authored-by: Juan Carlos Arevalo Baeza (JCAB) <jcab@ntdev.microsoft.com>
2022-06-20 13:58:43 -07:00
Adam Johnson
c266859544
[python3] Update to 3.10.5. (#25105)
* [python3] Update to current

* update versions to current

* [vfap] update python3 to current

* update vcpkgTools.xml
2022-06-17 14:15:56 -07:00
Max Khon
2e4c6df44c
[vcpkg_execute_*_process] Add support for build profiling (#22676)
Use --x-cmake-args=-DX_PORT_PROFILE=TRUE to enable port build profiling
2022-06-10 10:56:44 -07:00
Robert Schumacher
7d2449c346
[docs] Delete embedded documentation in favor of docs/ (#25096)
* [docs] Delete embedded documentation in favor of docs/

Drive-by for the helper ports:
1. "documentation": "https://vcpkg.io/en/docs/README.html"
2. "license": "MIT"
3. Use `include_guard(GLOBAL)` in all script files
4. Make sure any persistent variables are saved to the cache

* [docs] Restore empty regenerate.ps1 to satisfy Azure Pipelines

* [docs] PR comments
2022-06-07 16:26:51 -07:00
Kai Pastor
f20c7bf05b
[vcpkg-configure-make] Fix include path prepending (#24823)
* Fix include path prepending

* Update DISABLE_VERBOSE_FLAGS documentation

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
2022-05-20 14:41:10 -07:00
Kai Pastor
7e3dcf74e3
Fix vcpkg_host_path and its unit test (#24808)
* Fix vcpkg_host_path unit test

* Fix unit test variable control

* Enable all test features by default

* Fix recognition of PREPEND

* CMake doesn't set env vars to empty value

* Remove pointless STATUS message
2022-05-19 19:47:05 -07:00
Alexander Neumann
7ca918af71
dont change line endings on download (#24785) 2022-05-19 14:15:47 -07:00
Robert Kearns
e50057d13f
Exclude .DS_Store, fixing #24700 (#24701) 2022-05-16 12:40:11 -07:00
Jack·Boos·Yu
0d7603c4ef
[vcpkg_setup_pkgconfig_path] Add new functions to set or restore pkgconfig related environment variables (#23429)
* [vcpkg_configure_meson] Fix append host path

* New functions vcpkg_setup_pkgconfig_path and vcpkg_restore_pkgconfig_path

* Fix bug, add cos

* Apply suggestions

* Apply suggestions

* Apply suggestion

* doc

* Update docs/maintainers/vcpkg_setup_pkgconfig_path.cmake.md

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>

* Update scripts/cmake/vcpkg_setup_pkgconfig_path.cmake

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>

* Update scripts/cmake/vcpkg_configure_make.cmake

* Apply suggestions

* Apply suggestion

* Apply suggestions

Co-authored-by: Victor Romero <viromer@microsoft.com>
Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
2022-05-09 17:23:32 -07:00
Alexander Neumann
f7866c66d2
[vcpkg-cmake|cmake buildsystem] synchronize and sanitize scripts. (#23259)
* synchronize cmake build scripts.

* version stuff

* fix REMOVE_ITEM and add license

* format manifest

* update version

* use LOGFILE_BASE

* version update

* readd PREFER_NINJA and print a warning that it is deprecated for vcpkg_cmake_configure

* version stuff

* sync build_cmake

* only turn off ninja on windows

* add Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE

* use z_vcpkg_select_default_vcpkg_chainload_toolchain in meson

* remove VCPKG_CMAKE_GENERATOR

* version stuff

* reduce error to warning

* remove VCPKG_CMAKE_GENERATOR form configure_cmake

* version stuff

* version stuff

* use build_dir_<config>

* version stuff

* use ninja variable insead of pure ninja cmd

* version bump

* use ninja variable instead of calling ninja directly

* acquire ninja

* move the acquire.

* remove setting of cmake_prefix_path

* version stuff

* bump version date

* version stuff

* bump ashes baseline

* remove VCPKG_CMAKE_GENERATOR reference

* fix wrong variable reference due to refactor

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
2022-05-06 15:12:11 -07:00
Alexander Neumann
05c93c5c5a
[Fix uwp toolchain|world rebuild] make ninja work for uwp (#22831) 2022-04-27 18:12:48 -07:00
Benjamin Oldenburg
ce910bb87b
[skia,crashpad,zeroc-ice,vcpkg-tool-gn] New vcpkg-tool-gn and update of several ports (#24066) 2022-04-25 15:39:10 -07:00
Alexander Neumann
c556911a79
[vcpkg] Refactor toolchain & generator selection (#23846)
* put default generator and toolchain selection into a function

* update version-date of script

* version stuff

* restore PREFER_NINJA behavior on windows
use elseif instead of else

* cr ws change

* missing ,

* version stuff

* CR scripts/cmake/vcpkg_configure_cmake.cmake

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

* CR changes

* revert baseline

* update version

* bump version

* version stuff

* ci retrigger

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2022-04-11 15:57:36 -07:00
nicole mazzuca
7dd2e65c0b
[scripts-audit] minor vcpkg_from_* fixes (#19657)
* [scripts-audit] minor vcpkg_from_* fixes

* minor Billy CRs

* hopefully solve Billy's problems
2022-03-18 09:59:45 -07:00
Alexander Neumann
fad0644ade
add port vcpkg-tool-python2 (#23431)
* add vcpkg-tool-lessmsi

* add vcpkg-tool-python2

* adjust vcpkg_find_acquire_program

* use python2 dependency in qt5-base

* remove python2 from qt5-base

* add python2 to qt5-webengine

* use python3 instead of python2

* add some deps on the new vcpkg-tool-python2

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* add license field

* fix test detection

* error on failure to find python2

* move logs to correct position.

* add dep to qtwebengine

* adjust pybind cmake config.

* fix shiva

* move python2 to manual-tools
adjust search path
generate a details.cmake for vcpkg_find_acquire_program

* format manifest

* use version-date

* version stuff

* replace version-string

* more version stuff

* fix search path and add supports expression

* version stuff

* shiva version

* remove arm windows from support

* reuse output_path
use lessmsi is a host dep so use the correct path

* version stuff

* Fix x86 regression

* version stuff

* try fixing qtinterfaceframework

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: Victor Romero <viromer@microsoft.com>
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
2022-03-14 10:25:04 -07:00
Adam Johnson
89ed56ebab
[python3] Update to Python 3.10.2. (#23156)
* [python3] Update to Python 3.10.2.

* Version nonsense

* Update Python tool to 3.10.2.

* [python3] Update version file

* [python3] Update versions again

Co-authored-by: Victor Romero <viromer@microsoft.com>
2022-03-11 11:36:11 -08:00
Jack·Boos·Yu
e86ed50718
[vcpkg_configure_make] Report warning when unresolved arguments are passed in (#22567)
* [vcpkg_configure_make] Report warning when unresolved arguments are passed in

* Add missing option NO_DEBUG

* Add _VCPKG_MAKE_NO_DEBUG for vcpkg_configure_make

* Add more condition

* [apr] Remove NO_DEBUG

* [liburing] Remove NO_DEBUG

* [apr-util] Remove NO_DEBUG

* version

* Mssing port-version ++

* version
2022-03-02 13:43:19 -08:00
Daniel Schürmann
a34997af6c
[vcpkg] Meson osx sysroot (#21772)
* [get_cmake_vars] add -isysroot flag independednt of crosscompiling

Even without crosscompiling it is possible to specify a VCPKG_OSX_SYSROOT or
a SDKROOT this should be popagated to autotools and meson builds as well.

* [meson] add -arch and -isysroot to linker flags in case of osx crosscompile

* [meson] avoid DEPRECATION warning about flags in the [properties] section

* [meson] don't set OSXROOT evironment varibale

* [meson] don't set MACOSX_DEPLOYMENT_TARGET environment variable

cmake appends the -mmacosx-version-min flag c/cxx flags, overriding the
value set via VCPKG_C_FLAGS. By setting the environment variable, the
VCPKG_C_FLAGS value was used for meson builds. Now the same value is
taken for both.

* [meson/make] Add CMAKE_OSX_DEPLOYMENT_TARGET to VCPKG_DETECTED_CMAKE_C_FLAGS

This is done in the same way in CMake internally
2022-02-24 11:04:11 -08:00
acd1034
6a67b165a8
Fixes typo in vcpkg_download_distfile.cmake (#23181) 2022-02-22 12:12:49 -08:00
Thomas1664
f7db911f44
[vcpkg docs] Remove deprecated functions from docs (#23018)
* Remove deprecated functions from docs

* Fix docs in cmake files

* Fix links
2022-02-17 17:08:33 -08:00
Jack·Boos·Yu
dc470a9bd7
[vcpkg_find_acquire_program] Update tool flex/bison to 2.5.25, change repo to github (#23084) 2022-02-15 20:32:16 -08:00
Phoebe
897f02781f
[vcpkg_acquire_msys] Update version and hash (#22974)
* [vcpkg_acquire_msys] Update version and hash

* Address the review suggestions

* Update scripts/cmake/vcpkg_acquire_msys.cmake

Revert bash changes

* Update scripts/cmake/vcpkg_acquire_msys.cmake

Revert libintl

* Update scripts/cmake/vcpkg_acquire_msys.cmake

Revert gcc-libs

* Revert diffutils and libreadline

* Revert autoconf sed and make

* Revert gzip file findutils runtime binutils

* Add the revert pkgs back except msys2-runtime

* Update python to 3.9.x cause failure in tensorflow and tensorflow-cc
2022-02-15 20:26:02 -08:00
Daniel Schürmann
016788b220
[vcpkg_configure_make] Fix handling of link flags (#22798)
* [vcpkg_build_make] only link against manual-link folder if exists

* [vcpkg_configure_make] don't set LD_LIBRARY_PATH

This is not recommended during the normal build process
https://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html

* [vcpkg_build_make] Only set the lib path if exists

* [vcpkg_configure_make] Resore handling of _LINK_ environment variable

* [vcpkg_build_make] Backup and restore CPPFLAGS CFLAGS CXXFLAGS RCFLAGS

* [vcpkg_build_make] Fix name of LINKER FLAGS detected from cmake

* [vcpkg_build_make] replace obolete _VAR_SUFFIX with cmake_buildtype
2022-02-15 18:31:16 -08:00
Daniel Schürmann
d15470bb64
[vcpkg_configure_make] Set the --host parameter in case of Linux crosscompile (#22331)
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2022-02-08 22:53:17 -08:00
Jack·Boos·Yu
dd7550b0fc
[vcpkg_fail_port_install] Deprecate function (#21489)
* [vcpkg_fail_port_install] Deprecate function

* Update doc

* Apply suggestions

* Revert changes about include this function and delete doc

* Apply suggestions

* version

* Update docs/maintainers/vcpkg_fail_port_install.md

Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com>

* Update scripts/cmake/vcpkg_fail_port_install.cmake

* Update scripts/cmake/vcpkg_fail_port_install.cmake

* Use message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}"  to ensure it works with `--prohibit-backcompat-features`.

Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-02-03 13:04:55 -08:00
autoantwort
6ba505cf2c
[vcpkg] collect error logs in logs.txt in the buildtrees folder (#22146)
* collect error logs in logs.txt in the buildtrees folder

* Use global variable

* rename file to error-logs-.txt and remove error: prefix in file
2022-01-28 11:30:49 -08:00
Phoebe
7fe7314acb
[vcpkg_find_fortran] Update mingw-* version (#22786)
* [vcpkg_find_fortran] Updat mingw-* version

* Fix hash
2022-01-26 23:02:21 -08:00
Jack·Boos·Yu
f5d67552e0
[vcpkg_execute_build_process] Catch more compiler signal (#22566)
* [vcpkg_execute_build_process] Catch more cc1plus signal

* remove cc1plus

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2022-01-19 09:01:47 -08:00
Phoebe
3d794d08fe
[vcpkg_find_fortran] Update the mingw-w64-i686-mpc* (#22519)
* [vcpkg_find_fortran] Update the mingw-w64-i686-mpc*

* Update the version for x64
2022-01-13 10:53:06 -08:00
Max Khon
7534d241b0
[vcpkg] z_vcpkg_get_cmake_vars(): Use build-type-specific cache variable if VCPKG_BUILD_TYPE is defined (#22461)
* z_vcpkg_get_cmake_vars(): Use build-type-specific cache variable
if VCPKG_BUILD_TYPE is defined

Some ports (e.g. gettext) execute debug and release builds manually
(with different options). If a globally cached copy of cmake vars file
is used, the second build type has no cmake vars defined (e.g. CFLAGS is empty)
because generated and globally cached cmake vars file includes only cmake vars
for the first build type

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2022-01-11 15:28:43 -08:00
Kai Pastor
03d1a43303
[vcpkg_execute_build_process] Catch ld signal 9 (#22417)
* [vcpkg_execute_build_process] Catch ld signal 9

* Update message output
2022-01-11 14:29:24 -08:00
Alexander Neumann
f5981dabf0
[vcpkg|scripts] correctly restore env vars (#22313) 2022-01-04 20:00:21 -08:00
nicole mazzuca
bfbdf28bf4
[vcpkg_fail_port_install] add a warning about extra args when ALWAYS is passed (#20314)
* [vcpkg_fail_port_install] add a warning about extra args when ALWAYS is passed

* Address the review suggestions

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-12-28 14:43:05 -08:00
Kai Pastor
4b1c874451
Pass native install dir to nmake (#22095) 2021-12-20 11:34:01 -05:00