Commit Graph

13 Commits

Author SHA1 Message Date
Kai Pastor
5a5242aee4
[world rebuild][vcpkg scripts] Test, fix, extend vcpkg_execute_required_process (#39445)
Fixes `OUTPUT_VARIABLE`, `ERROR_VARIABLE`. 

vcpkg always wants logfiles. CMake (`execute_process`) doesn't send
stdout/stderr to files and variables at the same time, and even "the
precedence is not specified". So simultaneous output has to be handled
in `vcpkg_execute_required_process`.

At this occasion, port the arguments for stripping trailing whitespace.

`tensorflow-common` implicitly relied on the broken behavior. I chose
the minimal fix: drop the pointless calls, just set the empty value.
2024-06-28 22:21:10 -07:00
Matthias Kuhn
874fff8a6a
Fixup Macho-O rpath for osx-dynamic (#39313) 2024-06-27 14:26:23 -07:00
Kai Pastor
94a50e8c13
[vcpkg_fixup_pkgconfig] Fix lib names starting with debug/optimized/general (#39227)
Thanks for the fix and the tests!
2024-06-13 00:37:56 -07:00
Kai Pastor
a59ba45e60
[vcpkg-scripts] Fix rpath fixup; add test (#37964)
Fix fixup for debug tools,
https://github.com/microsoft/vcpkg/pull/37736#issuecomment-2035415913.
Fix fixup for paths with regex chars,
https://github.com/microsoft/vcpkg/issues/37984.
2024-04-23 15:09:16 -04:00
Kai Pastor
215a253559
[z_vcpkg_setup_pkgconfig_path] debug needs share/pkgconfig (#36151)
Pass `share/pkgconfig` instead of `debug/share/pkgconfig`: The `share`
location is for config-independent data.
Integrate `CURRENT_PACKAGES_DIR` locations.
Change the function interface to take a CONFIG parameter instead of
prefix list (suggested below).
Use `z_vcpkg_setup_pkgconfig_path` also for `vcpkg_fixup_pkgconfig`
(which already had proper handling of `CURRENT_PACKAGES_DIR` and
`share`).
Remove redundant trailing slash.
Extend unit test.

Fixes consuming `wayland-protocols` and similar.
2024-03-01 16:35:37 -08: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
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
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
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
Kai Pastor
3565cab797
[vcpkg-cmake-config] Merge INTERFACE_LINK_LIBRARIES configurations (#22546)
* Merge INTERFACE_LINK_LIBRARIES configurations

Direct references to binaries must match the active build type when used.

* Update tmx for cmake_config_fixup

* Update versions

* Prevent repeated fixup of the same file

* Don't change line structure

* Update versions

* CI

* Apply CR suggestion

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

* Update versions

* Fixup CR suggestion

* Update versions

* Update versions

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2022-02-18 13:54:55 -08:00
nicole mazzuca
f0281bf749
[scripts-audit] vcpkg_fixup_pkgconfig (#19658)
* [scripts-audit] vcpkg_fixup_pkgconfig

* Neumann-A CR, fix docs

* vcpkg_fixup_pkgconfig bugs

* fix group

* moar fixing

* be more clever around pkg_config_path

* add `vcpkg_host_path_list` so that we can unit test

* move stuff around a bit

* fix bug in vcpkg_host_path_list.cmake

* ras0219 CRs
2021-09-27 13:27:44 -07:00
nicole mazzuca
a5a70c7c3e
[vcpkg_minimum_required] fix, add unit tests (#19257)
* fix vcpkg_minimum_required

drive-by scripts audit

* initial unit tests

* finish unit tests
2021-07-30 12:57:07 -07:00
nicole mazzuca
0e1dc12185
[rollup] Rollup PR 2021-07-16 (#19001)
* [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY)

[vcpkg-cmake] Add check for unused cmake variables

* [rollup:2021-07-16 2/7] PR #18397 (@strega-nil)

[vcpkg_list] add new function

* [rollup:2021-07-16 3/7] PR #18782 (@strega-nil)

[scripts-audit] vcpkg_build_ninja

* [rollup:2021-07-16 4/7] PR #18784 (@strega-nil)

[scripts-audit] vcpkg_minimum_required

* [rollup:2021-07-16 5/7] PR #18785 (@strega-nil)

[scripts-audit] vcpkg_replace_string

* [rollup:2021-07-16 6/7] PR #18786 (@strega-nil)

[scripts-audit] windows scripts

* [rollup:2021-07-16 7/7] PR #18945 (@strega-nil)

[many ports] remove deprecated vcpkg_check_features call [1/5]

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-07-20 10:24:58 -07:00