-
Notifications
You must be signed in to change notification settings - Fork 6.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bulk convert CONTROL files #19986
Bulk convert CONTROL files #19986
Conversation
Example spot-check PRs for each of the 3 kinds of edits the script made:
I intentionally made no conversions from "version-string" to "version" or similar as that would have required manual analysis of each |
Depends on #20039 |
…uld not require extensive review. ``` function Convert-Control { Param($full) .\vcpkg.exe format-manifest $full $root = $full.Substring(0, $full.Length - 7) # CONTROL $new = $root + 'vcpkg.json' $content = Get-Content -Raw $new $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100 $oldVersion = $asJson['port-version'] if ($null -eq $oldVersion) { $oldVersionFull = $asJson['version-string'] Write-Host "Got version $oldVersionFull" $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$') if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) { $newFullVersion = [string]$match.Groups[1].Value $oldVersion = [int]$match.Groups[2].Value Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion" $newVersion = $oldVersion + 1 $asJson['version-string'] = $newFullVersion Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion" } else { Write-Host "No previous version for $full -- setting 1" $newVersion = 1 } } else { $newVersion = [int]$oldVersion + 1 Write-Host "New version for $full : $newVersion" } $asJson['port-version'] = $newVersion $content = ConvertTo-Json $asJson -Depth 100 Set-Content -Path $new -Value $content .\vcpkg.exe format-manifest $new } Get-ChildItem ports\CONTROL -Recurse | Foreach-Object { Convert-Control $_.FullName } git commit -am "this message" .\vcpkg.exe x-add-version -all git commit -a --amend ```
742e3e8
to
7787517
Compare
9f47e02
to
923ef27
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout c759b997badbdc58fd9fd6b1e859e66988d2fe75 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json
index 69114bb..5314666 100644
--- a/versions/l-/libjpeg-turbo.json
+++ b/versions/l-/libjpeg-turbo.json
@@ -6,7 +6,7 @@
"port-version": 2
},
{
- "git-tree": "b4852dfbc05166d63fc80ed7e4d48a52d4d71b15",
+ "git-tree": "88d4315ae4daa0619554d0465564beee0a688d71",
"version": "2.0.6",
"port-version": 1
},
Should we check some of them to check their correctness? |
You can check some, although we've already had a fair amount of machine checking by virtue of the |
Bulk convert control files. (microsoft#19986)
Note that leaving all those |
That is true. I do wish we could eliminate that problem too but getting off version-string really needs to be a conversation with upstream for each of the ports since it's a statement of intent with the upstream. (i.e. is 1.2.3 semver? need humans to get an idea) The point was to be better than the status quo, not done. |
* [tinyfiledialogs] Fix usage (#19723) * [tinyfiledialogs] Fix usage * Update version files * [KWSys] add new port (#19712) * add kwsys port * ./vcpkg x-add-version --all * unsupport uwp * ./vcpkg x-add-version --all * Fix versions for port * Update version database * corrections * corrections2 * corrections3 * update hash * [rmlui] Update to 4.2 (#19719) * [vcpkgTools.xml] Update cmake 3.20.4 hash for freebsd (#19697) * [frugually-deep] update to v0.15.10 p0 (#19691) * update * version * [imgui] Update to 1.84.1 (#19677) * [imgui] Update to 1.84.1 * [imgui] Update version files Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com> * [openssl] Update to 1.1.1l (#19739) * [Libb64] Add new port (#19447) * [vcpkg] Add triplet option VCPKG_NO_COMPILER_TRACKING (#17526) * [zstd] update to 1.5.0 (#18915) * [ginkgo] Update to 1.4.0 (#19731) * [ginkgo] add release 1.4.0 * [ginkgo] x-add-version * Update ports/ginkgo/usage * [ginkgo] download large patch on demand * [ginkgo] x-add-version * [vtk] Fix OpenGL feature (#19735) * [vtk] Fix typo that breaks OpenGL feature Missspelled "VTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2" * [vtk] Bump version * [many ports] Add vcpkg_fixup_pkgconfig (#19721) * [many ports]Add vcpkg_fixup_pkgconfig * version * Update ports/libepoxy/vcpkg.json Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update versions/l-/libepoxy.json * Update versions/l-/libepoxy.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [OpenColorIO] Fix OpenColorIO v2.0.1 can't be find_package (#19725) * fix that opencolorio v2.0.1 can't be `find_package`, reference the master branch of opencolorio to generate `OpenColorIOTargets` * run `vcpkg x-add-version --all` * fix the `OpenColorIO` for linux * vcpkg x-add-version --all * patch for `OpenColorIOConfig.cmake` by https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1397 * vcpkg x-add-version --all * [openxr-loader] Update to 1.0.18 (#19574) * [directxtk, directxtk12, directxtex] ports updated for August 2021 release (#19320) * DirectXTex port updated * DirectX Tool Kit updated for August 2021 release * Update baseline * Remove build of MakeSpriteFont * Update baseline * Added 4.7.2 .NET TargetingPack * Back out adding .NET targeting pack, forked out as https://github.com/microsoft/vcpkg/pull/19764 Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [srpc] add port of sogou/srpc (#16295) * [onnx] create a new port (#18073) * [gettext] Add "autopoint" tool to gettext[core] (#17317) * [glog] Fixed gflags dependency (#18739) * [crow] fix sha-512 sum (#19637) Signed-off-by: Luca Schlecker <luca.schlecker@hotmail.com> * [vcpkg baseline][lapack-reference] Fix copy openblas's pkgconfig file (#19628) * [lapack-reference] Fix copy openblas's pkgconfig file * version * Use vcpkg-cmake and vcpkg-cmake-config instead * version stuff * Restore the changes about vcpkg-cmake-configure / vcpkg-cmake-install * update version keyword * version * [bddisasm] Update to 1.34.2 (#19761) * [llvm] update to 12.0.1 (#19741) * [pango] Fix libthai splelling (microsoft#19758) (#19760) * [approval-tests-cpp] Update to 10.10.0 (#19621) * [approval-tests-cpp] Update to 10.10.0 * add version files * bootstrap.sh: fails if there is no entry for a tool os combination (#19640) * [libunifex] create a new port (#19279) * [libunifex] create a new port * [libunifex] update version/baseline * [libunifex] fix wrong support expression * update version SHA * [libunifex] more warning comments * [libunifex] use `unofficial::` namespace * [libunifex] allow warnings in build * simplify the patch file * Update ports/libunifex/vcpkg.json Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * [libunifex] update patch files * [libunifex] replace INCLUDEDIR to include Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * [CGNS|VTK-M|VTK|ParaView] Update ports (#18248) * [cgns] update to 4.2.0 * [vtk-m] update to 1.6.0 * [vtk] Update to 9.0.1-pv5.9.1 - VTK update to match release version of ParaView * [ParaView] Update to 5.9.1 * version stuff * fix automatic svg linkage in static builds * update qt5-svg * revisit vtk - fix build with vtk-m 1.6 - remove unused patches - remove comments * bump version * remove two commented lines * version stuff * remove old PR version Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [kf5guiaddons] fix Wayland scanner not being found by transitive deps; fix static builds (#19203) * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE variable to Config.cmake * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous options * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous lines, bump version * [kf5guiaddons] update versions * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE to MAYBE_UNUSED_VARIABLES * [kf5guiaddons] update versions * [kf5guiaddons] replace CURRENT_INSTALLED_DIR without affecting other vars * [kf5guiaddons] update deprecated functions * [kf5guiaddons] wrap paths in quotes * [kf5guiaddons] update versions * [kf5guiaddons] use PACKAGE_PREFIX relative path instead CURRENT_PACKAGES_DIR * [kf5guiaddons] update versions * [kf5guiaddons] cache the QtWaylandScanner_EXECUTABLE variable * [kf5guiaddons] update versions * [kf5guiaddons] update versions * [kf5guiaddons] Add missing static dependency * [kf5guiaddons] update versions * [kf5guiaddons] rename patch file * [kf5guiaddons] update versions * [kf5guiaddons] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5guiaddons] update versions * [freetype] update to 2.11.0 (#19284) * [freetype] update to 2.11.0 * add version files * Document VCPKG_TARGET_IS_MINGW (#19790) * [spix] Add new port (#19351) * [anyrpc] Bump version to export missing symbol * [spix] Add port * versioning * Update ports/anyrpc/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * versioning * Update ports/anyrpc/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * versioning Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [harfbuzz] update to 2.8.2 (#19615) * [harfbuzz] update to 2.8.2 * update version * revert patch format * update version * [wavelib] Update to 2021-08-10 (#19477) * [wavelib] Update to 2021-08-10 [wavelib] Add vcpkg.json * [wavelib] Add version * [wavelib] Clean * [wavelib] Overwrite version * [kf5wallet] new port (#19450) * Add kf5kwallet port * Fixed kf5wallet for windows * [kf5wallet] update to 5.84.0 * [kf5wallet] port CONTROL to JSON * [kf5wallet] use msgmerge provided by gettext port * [kf5wallet] only remove what's required * [kf5wallet] wrap paths in quotes * [kf5wallet] update deprecated functions * [kf5wallet] DISABLE_PARALLEL_CONFIGURE to fix clang-format error * [kf5wallet] update versions * [kf5wallet] remove static /bin folders * [kf5wallet] update versions * [kf5wallet] use semVer * [kf5wallet] update versions * [kf5wallet] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5wallet] update versions Co-authored-by: Kuntal Majumder <hellozee@disroot.org> * fix bootstrap.sh on arm macs (#19622) * [daw-json-link,daw-header-libraries,daw-utf-range]Update many ports (#19755) * update many ports * update version * Update ports/daw-header-libraries/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-json-link/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-utf-range/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-json-link/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-json-link/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-utf-range/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * update version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [cli] update to v.2.0.0 (#19744) * [cli] Update the version to 1.1.1 * [cli] Update the version to 1.2.1 * [cli] Update the version to 1.2.1: fix PR requests * [aricpp] create a new port (#17162) * [cli] run the command: ./vcpkg x-add-version --all * [aricpp] change request for #18048 * Update ports/aricpp/portfile.cmake * [aricpp] change request for #18048 * Update ports/aricpp/vcpkg.json * Update ports/aricpp/vcpkg.json * Update versions/a-/aricpp.json * Update versions/a-/aricpp.json * [aricpp] port-version -> 0 * [cli] v. 2.0 * [cli] Update ports/cli/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/cli/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [cli] bump port version * Update versions/c-/cli.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Daniele Pallastrelli <daniele.pallastrelli@sadel.it> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [libics] Add DISABLE_PARALLEL_CONFIGURE and update to 1.6.5 (#19652) * [libpmemobj-cpp] update to 1.13.0 (#19630) * [libpmemobj-cpp] update to 1.13.0 * update version * [plf-colony] Update to 6.28 (#19627) * [plf-colony] Update from 5.33 to 6.28 * [plf-colony] Update version files Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com> * [libmt32emu] update from 2.5.0 to 2.5.3 (#19754) * [libmt32emu] update from 2.5.0 to 2.5.3 * update version * [ctre] Update to 3.4.1 (#19614) * update to 3.4.1 * update baseline * [Mesa] update to 21.2.0 (#19612) * [Mesa] update to 21.2.0 * update verison * [jwt-cpp] port update to add version 0.5.1 (#19618) * Update vcpkg.json * Update portfile.cmake * Update baseline.json * Update jwt-cpp.json * Update jwt-cpp.json * [functions-framework-cpp] update to latest release (v0.6.0) (#19603) * [functions-framework-cpp] update to latest release (v0.6.0) * Fix version in portfile * [docs] improve integrate documentation (#19700) * [docs] improve integrate documentation * Small suggestions Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [google-cloud-cpp] use features to stop package growth (#19600) * [google-cloud-cpp] use features to stop package growth We have plans to grow `google-cloud-cpp`, but we think the build times are large enough already. This creates "features" to at least stop the package growth as new features are added. The "default-features" reflects the current features in the package. * Remove versions created during development * Address review comments * [vcpkg] [issue template] Questions would be posted in the discussion section instead (#18696) * [libffi] Use -llibffi on Windows (#19655) * Use -llibffi on Windows Replace -lffi with -llibffi for Windows development, not just mingw * Update portfile.cmake * Update baseline.json * Update libffi.json * Add port-version and make path quoted * Update version files Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com> * [eastl] fix dependency eabase (#19643) * [comms,commsdsl,comms-ublox] update ports (#19581) * update comms, add tools feature; update commsdsl * update versions * update comms-ublox * update version * add quotes to paths * version * fix comms dir remove * version * remove VCPKG_POLICY_DLLS_WITHOUT_LIBS * version * fix some paths * version * only allow build of tools if triplet is dynamic * version * fail on static * version * replace deprecated functions and replace options * version * fix * fix 2 * update version * apply @JackBoosY suggestions * version * Update ports/comms/portfile.cmake * Update versions/c-/comms.json * add @NancyLi1013 suggestions * update versions Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [ngspice] Update to release 35 (#19542) Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [liblo] Fix filenames for linux in liblo portfile (#19660) * Fix filenames for linux vs windows in liblo portfile * Removed deprecated call and now using vcpkg_copy_tools * Upgraded to manifest file * Increment port-version * Remove now working builds from ci.baseline * Updated versioning files * Fixed type for vcpkg.json * Updated sha for liblo version * [trantor] Update to 1.5.1 (#19443) * [trantor] Update to 1.5.1 * Update ports/trantor/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/trantor/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update cmake functiom * update version * fix ci baseline issue * update version * fix ci error * add port version * update version * Repair old drogon sha. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [kf5configwidgets] new port (#16562) * Add kf5configwidgets port * Fix KF5ConfigWidgets for windows * [kf5configwidgets] update to 5.75.0 * [kf5configwidgets] convert CONTROL to manifest * [kf5configwidgets] update versions * [kf5configwidgets] update to 5.81 * [kf5configwidgets] update versions * [kf5configwidgets] update to 5.84 * [kf5configwidgets] update versions * [kf5configwidgets] add 'designerplugin' feature * [kf5configwidgets] update versions * [kf5configwidgets] wrap paths in quotes * [kf5configwidgets] update versions * [kf5configwidgets] actually update SHA512 * [kf5configwidgets] update versions * [kf5configwidgets] fix static builds * [kf5configwidgets] set QT plugins path correctly * [kf5configwidgets] update versions * [kf5configwidgets] remove obsolete versions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5configwidgets] rename patch file * [kf5configaddons] update versions Co-authored-by: Kuntal Majumder <hellozee@disroot.org> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [Bullet3] fixes config failures. (#19236) * fix bullet3 * add-version * change version-string to version * overwrite version * add export targets; change usage_file * version * add bullet include dirs to target * version * remove line break * version * apply changes from @JackBoosY * version * change EOL to LF * version * [faiss] update to v1.7.1 (#19752) * [faiss] update to v1.7.1 * update version * update vcpkg.json format * update version * update patch * update version * Remove duplicate variable usage from the patch. * x-add-version Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [boost-context] arm64 linux abi fix (#19522) * [boost-context] arm64 linux abi fix * [boost-context] baseline version updated * [freexl] Fix mingw, cleanup (#19504) * New port version, format manifest * Revise portfile * Add mingw support * Add libiconv dependency to pc file * x-add-version * Apply PR comment * x-add-version * [jwt-cpp] Fixes SHA512 (#19845) * Fixes jwt-cpp This is a fix for #19837 Not sure why the hash worked a few days ago but appears to have broken now though (that needs some investigation). But the build is indeed broken * update port version * version Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> * [parallel-hashmap] Update to 1.33 (#19863) * Update parallel-hashmap to version 1.33 * Result or running ./vcpkg x-add-version --all Co-authored-by: Andrew Dean <Andrew.Dean@microsoft.com> * [vcpkg_from_github] Fix version regex matching issue (#19815) * [kf5archive] fix cmake.in to allow consumption by static builds (#19194) * [kf5archive] fix cmake.in to allow consumption by static builds * [kf5archive] update versions * [kf5archive] add lzma, zstd features * [kf5archive] update versions * [kf5archive] fix MAYBE_UNUSED_VARIABLES usage * [kf5archive] replace deprecated functions * [kf5archive] use semVer * [kf5archive] update versions * [kf5archive] add vcpkg_check_features * [kf5archive] update versions * [kf5archive] remove redundant option Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5archive] wrap all paths in quotes * [kf5archive] update versions * [kf5archive] lookup ZSTD using CMake * [kf5archive] update versions * [kf5archive] fix vcpkg_cmake_config_fixup() usage * [kf5archive] update versions * [kf5archive] rename patch files * [kf5archive] update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5coreaddons] fix Windows static builds & CMake Config (#19439) * [kf5coreaddons] fix Windows static builds https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 Also: - replace deprecated functions - embrace paths in quotes - actually remove the folders that need to be removed * [kf5coreaddons] update versions * [kf5coreaddons] delete redundant REMOVE * [kf5coreaddons] update versions * [kf5coreaddons] save data files to default /share location * [kf5coreaddons] update versions * [kf5coreaddons] fix CMake Config for static builds * [kf5coreaddons] update versions * [kf5coreaddons] update versions * [kf5coreaddons] fix vcpkg_cmake_config_fixup() usage * [kf5coreaddons] update versions * [kf5coreaddons] workaround Linux Inotify issue * [kf5coreaddons] update versions * [kf5coreaddons] rename patch file * [kf5coreaddons] update versions * [oatpp-openssl] new port (#19265) * [oatpp-openssl] new port * [oatpp-openssl] uses version-semver * [oatpp-openssl] uses version-semver * [oatpp-version] has paramters with arguments surrounded by quotes * [oatpp-openssl] vcpkg x-add-version oatpp-openssl --overwrite-version * [oatpp-openssl] no unused vcpkg_cmake_configure options * [oatpp-openssl] no unused vcpkg_cmake_configure options Co-authored-by: mheyman <mheyman@localdomain> * [libsbsms] add new port with version 2.3.0 (#19312) * [libvpx] Add pkgconfig (#19355) * [libvpx] Add pkgconfig check * Update version files * Add vpx.pc.in on Windows * Update versions/l-/libvpx.json * Remove -lm from vpx.pc.in file * Update versions/l-/libvpx.json * Remove debug messages * Update versions/l-/libvpx.json * [icu] remove setting triplet (#19620) * [icu] remove setting triplet * add version files * [tensorflow] fix macOS build errors caused by numpy and bazel upgrades (#19363) * Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * issue targeted in newer numpy version * work-around for broken numpy libs on macOS * temporarily add debug code to analyze CI failures * again temporary debug code * fix linkage command on macOS (broken by Bazel upgrade) * fix regex for macOS linker command * remove debug code, bump version * x-add-version seems to require a separate commit... * Fix misspelled "acceleration". * x-add-version Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [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. * [qt5-activeqt, qt5-declarative] Skip activeqt in CI. (#19945) See https://github.com/microsoft/vcpkg/issues/19922 * Apply @workpadwan 's fix to bootstrap.sh on non-bash systems. (#19911) * [libvpx] Add realtime and highbitdepth features. (#19532) * added features for vpx to enable realtime, highbitdepth and pic * output of vcpkg format-manifest * added port version * ran format-manifest again * changed to port version 1 as implicit version is 0 * added updated version files * removed pic feature and instead set --enable-pic as default option * updated version database Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * Fix target_link_libraries on repeated inclusion of wrappers (#19120) * Fix repeated inclusion of wrappers * x-add-version * [portmidi] add osx support (#19366) * [portmidi] add osx support * [portmidi] replace CONTROL with vcpkg.json * [portmidi] Introduce "port-version": 1 * [portmidi] quote all path strings * [portmidi] update version database * [portmidi] make use of ${PORT} Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts (#19435) * [magnum/-plugins] Remove obsolete patches that no longer apply Signed-off-by: Squareys <squareys@googlemail.com> * [corrade] Make feature to flag translation consistent to fix warning Consistent with magnum & magnum-plugins Signed-off-by: Squareys <squareys@googlemail.com> * Fix warning message for dlls without matching pdbs always displayed Signed-off-by: Squareys <squareys@googlemail.com> * Fix the baseline version * Revert the changes in vcpkg_copy_pdbs.cmake Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> * [qtbase] Download submodules over https instead of plain git protocol (#19844) * [asio] update to 1.19.2 (#19846) * [asio] update to 1.19.2 * update version * [tvision] Add new port (#19480) * [tvision] Add new port (fix #15839) * [tvision] Add version file * [tvision] getenv is not available on uwp * [tvision] Overwrite version * [tvision] Clean * [tvision] Overwrite version * [nlohmann-json] update to 3.10.2 (#19690) * update to 3.10.0 * version * install pkg-config * version * fix package naming * version * apply @NancyLi1013 suggestions * version * update to new minor * version * update to 3.10.2 * version * [geos,librttopo] Fix linkage and other quirks (#19492) * [geos] Minor portfile maintenance * [geos] Export implicit C++ lib dependencies * [geos] x-add-version * [librttopo] New port version, format manifest * [librttopo] Modernize portfile * [librttopo] Fix mingw build * [librttopo] Use geos-config, allow dynamic linkage for non-windows * [librttopo] Fix pc file * [librttopo] Use pristine download from osgeo.org * [librttopo] x-add-version * Add aurodock-vina port (#19645) * [lager] add port (#19661) * add lager port * run `vcpkg x-add-version --all` Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [google-cloud-cpp] update to latest release (v1.31.0) (#19889) * [pangolin] Update to 0.6 and also support osx (#19840) * [pangolin] Update to 0.6 * Update version files * Format manifest * Revert to CRLF in original patches * Update versions/p-/pangolin.json * Support osx and add features * Remove extra space line * Update versions/p-/pangolin.json * Remove unused options * Update versions/p-/pangolin.json * Add MAYBE_UNUSED_VARIABLES * Update versions/p-/pangolin.json * [libdatachannel] Update to v0.14.3 (#19826) * [libdatachannel] update to version 0.14.3, fixing linking errors * [libdatachannel] correctly format manifest * [libdatachannel]: x-add-version --all * [jasper] update to 2.0.33 (#19798) * jasper * update version * update function * update version * [hexl] Update version to 1.2.1 (#19468) * update HEXL v1.2 * added x-add-version output * rename intel-hexl to hexl * update x-add-version output * update homepage * Update version database * update portfile * update portfile * add find GIT * Update version database * Update ports/hexl/portfile.cmake * use MSBUILD for Windows * Update version database * set generator * Update version database * update typo * Update version database * Fix build error * Update ports/hexl/portfile.cmake * Re-fix the dependencies * update hexl version * Update version database * locate git, remove unused file * Update version database * update version, add dependency * update dependency * Update version database * update HEXL to 1.2.1 * Update version database * Fix version database. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [openssl] Support static builds on UWP (#19636) Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * Decouple the storage account used for binary caching from the images. (#19912) * Decouple the storage account used for binary caching from the images. We are being forced to change infrastructure somewhat more frequently than we would like, so change the binary caches to use a shared storage account like we already use for asset caching. * blob blob blob * Add quotes * Avoid name stomping. * [qt5-base] Download submodules over https instead of http (#19843) * [zlib] Download source over https instead of http (#19842) Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [libosmium/libxlsxwriter] Update to the latest version (#19935) * [libosmium/libxlsxwriter] Update to the latest version * Update version files * Update versions/l-/libosmium.json * Attempt to fix version database again. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [ktx] update to 4.0.0 release (#18644) * [ktx] update to 4.0.0 * update version * fix-arm64-error * update version * fix ci error * update version * [kf5crash] fix cmake.in to allow consumption by static builds (#19179) * [kf5crash] fix cmake.in to allow consumption by static builds * [kf5crash] update versions * [kf5crash] kcrash is supported on Win and macOS, too * [kf5crash] update versions * [kf5crash] replace deprecated functions * [kf5crash] update versions * [kf5crash] don't overzealously delete folders * [kf5crash] update versions * [kf5crash] proactively disable docs * [kf5crash] use semVer * [kf5crash] update versions * [kf5crash] remove extraneous options * [kf5crash] update versions * [kf5crash] wrap paths in quotes * [kf5crash] update versions * [kf5crash] remove bin folders in static build * [kf5crash] update versions * [kf5crash] rename patch file * [kf5crash] update versions * [kf5crash] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5crash] update versions * [icu] fixes for macOS dynamic lib install (#19441) * fixes for macOS dynamic lib install * bump port version * remove mingw change * move install outside of conditional * update portfile hash Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [pystring] rename `libpystring` to `pystring` (#19740) * rename `libpystring` to `pystring` * run `vcpkg x-add-version --all` * [pystring] Simplify CMake * [pystring] Use target name as per opencolorio Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * [folly] also support arm64 (#19738) * [catch2] Guard build type for Catch2 (#19793) * guard build type for catch2 * update port-version * update baseline & version * [simdutf] add new port (#19742) * [quill] Update to 1.6.3 (#19827) * [quill] Update to 1.6.3 * [quill] Update version files Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com> * [hazelcast-cpp-client] update to v4.2.0 (#19853) * update hazelcast-cpp-client to 4.2.0 * run x-add-version * [maintainer-guide.md] Add short names note. (#19956) * [approval-tests-cpp] Update to 10.11.0 (#19941) * [approval-tests-cpp] Update to 10.11.0 * add version files Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [docs] Fix a typo in CMAKE_DISABLE_FIND_PACKAGE command (#19829) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index b0dd0c4b7..48ea75d08 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -154,7 +154,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -CMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} ) ``` * [co] Add new port (#19535) * add package co * add version * fix support * fix version * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * using features instead of dependency * update version schema * fix portfile * fix hash * add comments & cleanup * fix hash * update portfile * up hash Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5globalaccel] new port (#19757) * Add kf5globalaccel port * Revert "Add kf5globalaccel port" This reverts commit f1ac3db8e2019f474a09d6964aea8e21bc9da166. * Add kf5globalaccel port * Fixed kf5globalaccel for windows * [kf5globalaccel] update to 5.75.0 * [kf5globalaccel] update to 5.84.0 * [kf5globalaccel] use vcpkg_copy_tools * [kf5globalaccel] only remove what's needed * [kf5globalaccel] wrap paths in quotes * [kf5globalaccel] use semVer * [kf5globalaccel] update versions * [kf5globalaccel] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5globalaccel] update versions Co-authored-by: Kuntal Majumder <hellozee@disroot.org> * [libmupdf/liblinear/libkeyfinder] Update to latest version (#19959) * [libmupdf/liblinear/libkeyfinder] Update to latest version * update version * update vcpkg.json format * update version * [sentry-native] Update port to use new vcpkg cmake scripts (#19839) Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com> * [libigl] fix imgui feature (#19746) * [libigl] fix imgui feature * run x-add-version * [simdutf] Disable benchmarks and tests. (#19987) * [kf5solid] Fix CMake config; some extra fixes (#19810) * [kf5solid] require bison >= 3.0 * [kf5solid] fix CMake config file * [kf5solid] some apps actually use solid-hardware5 diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index b876b00c0..53cf1841b 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -44,6 +44,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Solid) vcpkg_copy_pdbs() +vcpkg_copy_tools( + TOOL_NAMES solid-hardware5 + AUTO_CLEAN + ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() @@ -51,9 +56,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# solid-hardware and solid-power are a non-dev tools allowing to list hardware and power managament status of one's system. No need to keep them. -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}") -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml") * [kf5solid] /etc is empty, no need to remove it * [kf5solid] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5solid] update versions * [OpenCV] fix protobuf references (#19770) * [OpenCV] fix protobuf targets * [OpenCV] fix port versions * [OpenCV] fix references * [libssh] add static build support for MinGW subsystem (#19854) * add MinGW subsystem support for nana * update port version * [nana] update versions * format-manifest * add static build support for MingW subsystem Co-authored-by: Billy Robert ONeal III <bion@microsoft.com> Co-authored-by: Jonliu1993 <13720414433@163.com> * [sentencepiece] v0.1.95 (#19858) * [fmt] update to 8.0.1 (#18581) * [fmt] update to 8.0.0 * update version * revert patch foramt * update version * update version * [fmt] update to 8.0.0 * update version * [fmt] update to 8.0.1 * update version * Apply suggested change * update version * [kealib] Update, revise features (#19118) * Convert manifest to JSON * Remove purely transitive dependencies * Parallel is unsupported with HDF5 C++ * Revise portfile * Update to 1.4.14 * x-add-version * [cpp-ipc] Add new port (#19360) * [teemo] Update version to v2.3. * [teemo] Modify version to v2.2 * [teemo] Run `vcpkg x-add-version teemo` to add version info. * [teemo] Update Build-Depends. * Update versions/t-/teemo.json * [libipc] Add new library. * [libipc] Run ./vcpkg x-add-version --all * [libipc] Fix compile error. * update version * Update ports/libipc/CONTROL * update version * Update ports/libipc/portfile.cmake Co-authored-by: Billy O'Neal <bion@microsoft.com> * Update ports/libipc/portfile.cmake Co-authored-by: Billy O'Neal <bion@microsoft.com> * [cpp-ipc] rename libipc to cpp-ipc * [cpp-ipc] Run vcpkg x-add-version --all * [cpp-ipc] Remove old libipc * update cpp-ipc * update version * delet libipc.json Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com> Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy O'Neal <bion@microsoft.com> * [buck-yeh-bux] add port (#19670) * [bux] Add new port * Corrections according to Create Pull Request suggested questions * SHA512 * Mark fails into .\scripts\ci.baseline.txt * Mark fails into .\scripts\ci.baseline.txt * No need of "port-version": 1 in vcpkg.json * Update version database * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update bux.json * Update ports/bux/vcpkg.json * update version * Update scripts/ci.baseline.txt Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update bux support * update version * update version * Rename bux to buck-yeh-bux * Update version database Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> * [yaml-cpp] fix cmake and pkgconfig files (#19703) * [lcms] Update to 2.12 (#19551) In addition to updating the version to 2.12, the following modifications were applied to the port: - Use the name lcms2 for the library, as it is called upstream since version 2 of Little-CMS. Remark: In the past, the library has already been called lcms2 for a while in vcpkg (1e53c60 until 726c111). The ports in vcpkg, which currently require the port lcms (devil, libraw and opencolorio), use and support lcms2 include/lib. - Add generating a pkg-config file - Add quotes to file commands in portfile.cmake * [icu] Fix tool path (#19726) * [icu] Fix tool path * Update the baseline version * Apply the review suggestions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * proj4 uwp improvments (#18323) * Remove prior arm/uwp patch since host dependencies now allow for proj database generation, and add a new patch that repairs Win32 API calls to use UWP counterparts in UWP builds * Update ci baseline for port changes * Update port version * Fix patch list for PR * Bump port-version, disable some broken downstream libs * Update port version commit * [harfbuzz] update to 2.9.0 (#19817) * [harfbuzz] update to 2.9.0 * update version * update version to version-semver * update version * remove fontconfig option * update version * [uriparser] Update to v0.9.5 (#19820) * [uriparser] Update to 0.9.5 * [uriparser] Add new version * Small changes Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> * [libmediainfo/glslang] Update to the latest version (#19917) * [libmediainfo/glslang] Update to the latest version * Update version files Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [google-cloud-cpp] update to latest release (v1.31.1) (#19957) * [ms-gltf] Update to latest release r1.9.5.4 (#19958) * [ms-gltf] Fix the wrong homepage * Update pdb file path * Pass WINDOWS_USE_MSBUILD to vcpkg_cmake_configure * Update to latest release r1.9.5.4 * [openimageio] update version to 2.3.7.2 (#19961) * [openimageio] update version to 2.3.7.2 * Disable the test in vcpkg Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com> * [libuv/librsync/libqrencode] Update to latest release version (#19972) * [libuv/librsync/libqrencode] Update to latest release version * Update the baseline version * [libuv] Add new source file epoll.c * Update the source * Small changes * [arcus/any-lite/aixlog] Update to the latest version (#19977) * [arcus/any-lite/aixlog] Update to the latest version * update version * Apply requested changes * update version * update vcpkg.json * update version * [libharu] Fix renaming library when one of the build type is selected (#19979) * libharu: Fix renaming library when build type is either release or debug Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Run vcpkg x-add-version --all * Small changes Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * [libsamplerate] Update 0.2.1 -> 0.2.2 (#20003) * [libhsplasma/libpcap/lv2/libcrafter] Update to the latest version (#19965) * [libhsplasma/libpcap/lv2] Update to the latest version * [libpcap] Remove unused comments * Update version files * [lv2] Fix usage [libpcap] Update ci.baseline.txt * [libhsplasma] Remove x64-windows-static=fail from ci.baseline.txt * [libcrafter] Update to 1.0 * [libcrafter] Add vcpkg.json * Update version files * Add CRT check for libpcap and update version as versin-semver for libpcap * Update version files Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [vamp-sdk] fix library filenames to match upstream build systems (#20002) * [vamp-sdk] fix library filenames to match upstream build systems There were two problems: 1. The port added a `d` suffix for debug builds that upstream did not. This caused `find_library(VampHostSDK_LIBRARY NAMES vamp-sdk)` to fail to find the debug library. 2. The port used the same file name for libraries on every OS but that is not what upstream does. * [vamp-sdk] fix capitalization of Vamp Vamp is not an acronym. * [so5extra] Update to 1.4.1.1 (#20004) * so5extra updated to the latest version. * Fix for so5extra's manifest format. * so5extra version added to baseline. * Accepting suggestion for so5extra's manifest. * Update for so5extra version in baseline. * [imgui] update to 1.84.2 (#20012) * update imgui * version * use correct ref for docking * version * update commit for dockiung * version * [rappture] Update port to use vcpkg.json instead of CONTROL (#20049) Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com> * [libfort/libgit2/cli11] update to the latest version (#20024) * [libfort/libgit2/cli11] update to the latest version * update version * delete useless dependencies * update version * [glew/openvdb/xtensor-io] Update to latest release version (#20022) * [glew/openvdb/xtensor-io] Update to latest release version * [glew] Update patch * [xtensor-io] Update version * [h3/jaeger-client-cpp] Update to the latest version (#20008) * [h3/jaeger-client-cpp] Update to the latest version * Remove CONTROL files * Update version files * Update patch * Update versions/j-/jaeger-client-cpp.json * [simdjson] Update to v1.0.0 (#20052) * [simdjson] Update to 1.0.0 * [simdjson] Bump version * [fftw3/libwebsockets/uwebsockets] Update to latest release (#20051) * [libbson, mongo-c-driver] Convert to vcpkg.json. (#20039) * Fixes source writes rather than using DISABLE_PARALLEL_CONFIGURE * Fixes to use modern vcpkg helpers. * Fixes to install to the correct include path rather than moving the resulting includes after the fact. * Remove do-nothign renames. * Fixes to make static cmake configs find the correct bits. * [msbuild] add vcpkg to <Lib> search path (#20054) * [aubio] Add support for find_package (#19996) * [aubio] Add support for find_package * Add include(CMakeFindDependencyMacro) * x-add-version Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [libjpeg-turbo] Update wrapper to correctly find debug/release variant (#19319) * Format manifest * Fix cmake wrapper * Drop windows debug lib renaming * Fix build warnings * x-add-version * Consolidate azure-kinect-sensor-sdk patches * Fix jpegturbo dependency * x-add-version * Fix wrapper message * x-add-version * [azure-core-cpp] Update to 1.2.1 (#19943) ## 1.2.1 (2021-09-02) ### Bugs Fixed - [2785](https://github.com/Azure/azure-sdk-for-cpp/issues/2785) Fix to build on g++ 5.5. ### Other Changes - Fixed compilation error on POSIX platforms where OpenSSL was not available. - Support CMake version 3.12 Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * Bulk convert control files. (#19986) ``` function Convert-Control { Param($full) .\vcpkg.exe format-manifest $full $root = $full.Substring(0, $full.Length - 7) # CONTROL $new = $root + 'vcpkg.json' $content = Get-Content -Raw $new $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100 $oldVersion = $asJson['port-version'] if ($null -eq $oldVersion) { $oldVersionFull = $asJson['version-string'] Write-Host "Got version $oldVersionFull" $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$') if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) { $newFullVersion = [string]$match.Groups[1].Value $oldVersion = [int]$match.Groups[2].Value Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion" $newVersion = $oldVersion + 1 $asJson['version-string'] = $newFullVersion Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion" } else { Write-Host "No previous version for $full -- setting 1" $newVersion = 1 } } else { $newVersion = [int]$oldVersion + 1 Write-Host "New version for $full : $newVersion" } $asJson['port-version'] = $newVersion $content = ConvertTo-Json $asJson -Depth 100 Set-Content -Path $new -Value $content .\vcpkg.exe format-manifest $new } Get-ChildItem ports\CONTROL -Recurse | Foreach-Object { Convert-Control $_.FullName } git commit -am "this message" .\vcpkg.exe x-add-version -all git commit -a --amend ``` * [angle] Enable ANGLE's desktop GL backend (#19891) * Enable ANGLE's desktop GL backend Only the D3D and GLES backends were available, but getting desktop GL to work is trivial. The Vulkan backend would be a much bigger task, unfortunately. * x-add-version Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [meson] fix cross compiling from linux to windows (#18927) * [meson] fix cross compiling from linux to windows * Fix mingw system name * Omit empty fields from standard libraries * Use VCPKG_CROSSCOMPILING * vcpkg_configure_meson: do not double escape include paths * vcpkg_configure_meson: set winres instead of rc * vcpkg_configure_meson: do not always cross build * Apply suggestions from code review * fix the issue I made * [meson] error when gcc uses a different linker executeable * [meson] apply code review from strega-nil * [meson] more verbose error messages * [meson] remove wrong check Co-authored-by: Kai Pastor <dg0yt@darc.de> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * [freeimage] Enable version information in FreeImage.dll (#19610) * [freeimage] Add version in FreeImage.dll * Add version files Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [openimageio] Fix find and use dependencies (#19916) * [openimageio] Fix find and use dependencies * version * Restore FindOpenEXR.cmake * version * Update ports/openimageio/portfile.cmake * Update versions/o-/openimageio.json * Re-make patch * version * Update versions/o-/openimageio.json * Update ports/openimageio/portfile.cmake * version * [sqlite3] update to 3.36.0 (#19847) * [sqlite3] update to 3.36.0 * update version * [uthash] Add new port (#19823) * [uthash] Add new port * [uthash] Version stuffs * [nng] Update to v1.5.1 (#19478) * [nng] Update to v1.5.1 * [nng] Bump version * [nng] Quote source path * [nng] Bump version * [kf5i18n] static builds fixes (#20016) * [kf5i18n] fix libiconv transient dependency * [kf5i18n] update versions * [usrsctp] update to 0.9.5.0 (#20028) * [azure-sdk-for-cpp] Storage Sept Release (#20037) * [azure-storage-blobs-cpp] Update to 12.2.0 ## 12.2.0 (2021-09-08) ### Breaking Changes - `StartsOn` and `ExpiresOn` in `SignedIdentifier` were changed to nullable. ### Bugs Fixed - Fixed a bug where prefix cannot contain `&` when listing blobs. ### Other Changes - Create less threads if there isn't too much data to transfer. * [azure-storage-files-datalake-cpp] Update to 12.2.0 ## 12.2.0 (2021-09-08) ### Breaking Changes - `StartsOn` and `ExpiresOn` in `SignedIdentifier` were changed to nullable. ### Bugs Fixed - Fixed a bug where prefix cannot contain `&` when listing files. ### Other Changes - Create less threads if there isn't too much data to transfer. * [azure-storage-files-shares-cpp] Update to 12.2.0 ## 12.2.0 (2021-09-08) ### Breaking Changes - `AccessPolicy::StartsOn` and `AccessPolicy::ExpiresOn` are now nullable values. ### Bugs Fixed - Fixed a bug where prefix cannot contain `&` when listing files. ### Other Changes - Create less threads if there isn't too much data to transfer. * [azure-storage-queues-cpp] Update to 12.0.0-beta.1 ## 12.0.0-beta.1 (2021-09-08) ### New Features - Added support for Queue features: - QueueServiceClient::ListQueues - QueueServiceClient::SetProperties - QueueServiceClient::GetProperties - QueueServiceClient::GetStatistics - QueueServiceClient::CreateQueue - QueueServiceClient::DeleteQueue - QueueClient::Create - QueueClient::Delete - QueueClient::GetProperties - QueueClient::SetMetadata - QueueClient::GetAccessPolicy - QueueClient::SetAccessPolicy - QueueClient::EnqueueMessage - QueueClient::ReceiveMessages - QueueClient::PeekMessages - QueueClient::UpdateMessage - QueueClient::DeleteMessage - QueueClient::ClearMessages - Added support for queue SAS. * [azure-storage-common-cpp] Update to 12.2.0 ## 12.2.0 (2021-09-08) ### Features Added - Used new xml library on Windows, dropped dependency for libxml2. ### Bugs Fixed - Fixed a bug that may cause crash when parsing XML. * [sail] Update to 0.9.0-pre16 (#20046) * [sail] Update to v0.9.0-pre16 * [sail] vcpkg x-add-version --all * [sail] Update git REPO * [sail] vcpkg x-add-version --all --overwrite-version * [approval-tests-cpp] Update to 10.12.0 (#20058) * [approval-tests-cpp] Update to 10.12.0 * [approval-tests-cpp] Update to 10.12.0 * [functions-framework-cpp] update to latest version (v1.0.0) (#20071) * [civetweb] Update to version 1.15 (#20078) * [fontconfig] update to 2.13.94 (#19285) * [boinc] Add new port (#19659) Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com> * [vcpkg baseline][pangolin] Add features, fix dependency pybind11 (#20006) * [vcpkg baseline][pangolin] Add features, fix dependency pybind11 * Fix dependency name realsense2 * Remove default-feature gles * Re-generated patch, add MAYBE_UNUSED_VARIABLES, fix build with core * version * Fix desc, add more MAYBE_UNUSED_VARIABLES * version * more MAYBE_UNUSED_VARIABLES * version * Remove some CMAKE_DISABLE_FIND_PACKAGE_* * version * Remove more CMAKE_DISABLE_FIND_* since they are disabled * Remove BUILD_FOR_GLES_2 * version * Restore BUILD_FOR_GLES_2 * version * Fix more dependencies * [libuvc]Fix build type, fix usage * version * Re-make patch * version * Use libjpeg macros instead of target name to avoid use `find_dependency` * version * Fix usage on non-Windows * version * commit suggestions * version * Apply suggestion * version * Re-fix JPEG * version * typo * format * version Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * Azure-IoT-Sdk for C release for 08-30-2021 (#19809) * Release for 08-30-2021 * Update azure-iot-sdk-c vcpkg.json formatting * Update version database * Test commit. In progress. * bot actions * Update refs and hashes for main branch test * bot instructions * Add OpenSSL for uamqp, umqtt, uhttp * bot instructions * Update cmake build options 'warning_as_errors' to OFF; remove patch file * bot instructions * Update all REFs to current test commit in azure-iot-sdk-c momuno/curl-vcpkg-fix_20210831 * bot instructions * c-utility fix -- test * bot instructions * Update azure-iot-sdk-c REF and SHA512 for LTS release. Use version-date * Update version database * put back remove-werror.patch for LTS release. * Update versioning. bot instructions * bot instructions. * Adding back patch to portfile instructions. Removes warnings as errors * bot instructions Co-authored-by: Mollie Munoz <momuno@microsoft.com> * [David-Haim/concurrencpp] Add new port (#19997) * [David-Haim/concurrencpp] Add new package * Format vcpkg.json * Add baseline * Fix version * Update CI baseline * Revert "Update CI baseline" This reverts commit 8e3ed430f239e50a94a4afaaaee47e0f15998b06. * Add patch to make linkage configurable * Update git-tree hash * Add patch to set -fcoroutines flag * Update git-tree hash * Revert "Update git-tree hash" This reverts commit b3ccdb2c61f705f7802da880fa0659ece5f1a723. * Revert "Add patch to set -fcoroutines flag" This reverts commit a23c736df9d2ca407204ea57bf977932c4704e41. * Revert "Revert "Update CI baseline"" This reverts commit a50ed32a97fb19311cb13807af70cb5a9aa4b793. * Add supports attribute to manifest, disallow dynamic linkage on Windows * Update git-tree hash * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Fix whitespace * Update git-tree hash * Add vcpkg-cmake dependencies to vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Adapt for version 0.1.3, address suggestions * Update git-tree hash Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [Azure SDK Key Vault] Update to Sept Release Keys and Secrets (#20063) * [azure-security-keyvault-keys-cpp] Update to 4.1.0 ## 4.1.0 (2021-09-08) ### Features Added - Added `GetUrl()` to `KeyClient`. ### Bugs Fixed - [2750](https://github.com/Azure/azure-sdk-for-cpp/issues/2750) Support for Azure `managedhsm` cloud and any other non-public Azure cloud. * not-specified * [vcpkg] Update tool to 2021-09-10. (#20105) Resolves: * https://github.com/microsoft/vcpkg/issues/19552 * https://github.com/microsoft/vcpkg/issues/18217 * https://github.com/microsoft/vcpkg/issues/16631 See https://github.com/microsoft/vcpkg-tool/releases/tag/2021-09-10 for more details. * [libpqxx] Fix build issue with vs2017 (#20095) * Update pwsh to 7.1.14, separate image minting from vmss minting, and update VMs. (#20064) * Update Powershell-Core to 7.1.4. * Add deployment of .NET 4.7.2 targeting pack, extracted from https://github.com/microsoft/vcpkg/pull/19320 * Separate image minting from vmss minting. * Update pools. * Fix image minting typo on Windows. * [lz4] Install pc file, cleanup (#20108) * Drop unused xxhash dependency * Modernize portfile * Install pc file * x-add-version * Switch to 'version' field * Update versions * Fix liblz4 pc file name * Update versions * re-enable qt5-activeqt (#20083) * remove qt5-activeqt from baseline * add colmap as baseline fail * [libarchive] update to 3.5.2 (#16845) * libarchive 3.5.1 attempt to create package - error on libiconv. * update sha based on build error * Turn off the CMAKE_USE_SYSTEM_LIBARCHIVE option * remove unused patches * remove empty patches * Update scripts/test_ports/cmake/portfile.cmake Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * revisit control file -> vcpkg.json * recover patch files * remove port version per auto-review * restore INCLUDE(CreatePkgConfigFile) * update git-tree after merge * patches not referenced #facepalm * Update libarchive.json * added missing FEATURES keyword * update git-tree + merge fix * Update libarchive.json * Update libarchive.json * Update libarchive.json * libarchive 3.5.2 * formatting + git-tree * Update libarchive.json * should not remove wrapper ? * Update libarchive.json * revert patch original EOF * update version Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Seika <seika@machinex.ca> * [gdal] Make building executables optional (#19243) * [gdal] Optional "tool" feature to build executables Fixes #19189 * x-add-version * Fix remove of tools * Always delete the debug tools * Add patch to make tools build optional (non-windows) * Update patch to make tools build optional (windows) * Update git-tree * Update tools patch * Update git-tree * Revise windows tools handling * x-add-version * Remove empty bin dir * Update git-tree * Remove obsolete static tools patch * Update git-tree * update * reindent * x-add-version * restore version Co-authored-by: Kai Pastor <dg0yt@darc.de> * [Taskflow] update to 3.2.0 (#20122) * Update taskflow to 3.2.0 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com> * [Libuv] Fix iOS Build (#20117) * Use MacOS (Darwin) source files for building iOS version * Update version * Update version Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com> * [libhv] update to v1.2.1 (#19794) * [libhv] update to v1.2.1 * vcpkg x-add-version libhv * [libhv] move dlls from lib to bin * vcpkg x-add-version --overwrite-version libhv * [libhv] mkdir bin * vcpkg x-add-version --overwrite-version libhv * Don't protect `file(MAKE_DIRECTORY` Co-authored-by: hewei.it <hewei.it@bytedance.com> Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [libgo] fix baseline issue (#19773) * [libgo] fix baseline issue * [libgo] fix references * [libgo] fail fast on unsupported archs * [libgo] fix references * [libgo] fixes for macOS * [libgo] fix references * Minimize the patch Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> * [uchardet] Update to 2021-09-03 (#19980) * [uchardet] Update to 2021-09-03 * [uchardet] Bump version * [uchardet] Fix UWP build * [uchardet] Overwrite version * [uchardet] Add version Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [Qt] update to 6.1.3 (#19918) * [skip actions] update to 6.1.3 * remove wrong -D prefix from variables in qttools * change to https * version stuff Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [Docs] Document the unique port attribution rule. (#20087) * Document the unique port attribution rule. * Remove reference to #19922 * @strega-nil suggestions :D 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> * [cpp-httplib] Update library to 0.9.4 (#20116) * Update cpp-httplib to version 0.9.4 * Run x-add-version * Fix compile error in internal version of Visual Studio (#20127) * [VTK] fix cmake patches not recycling targets already defined (#20074) * [VTK] recycle alias targets if already defined * [VTK] bump port version * [VTK] fix references * [VTK] fix other patches for target recycling * [VTK] fix references Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [New port] Rexo (#18895) * [ports/rexo] New port * `vcpkg x-add-version --all` * [ports/rexo/portfile.cmake] Update version; use vcpkg_configure_cmake * `vcpkg x-add-version --all` * [versions/r-/rexo.json] Manually remove first iteration * vcpkg_cmake_install() Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/rexo/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/rexo/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/rexo/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [rexo] Upgrade to 0.2.1; use new vcpkg cmake function names * ./vcpkg x-add-version --all --overwrite-version; remove 0.2.0 from versions/r-/rexo.json * [rexo] Upgrade to 0.2.2 * ./vcpkg x-add-version --all --overwrite-version * [rexo] Upgrade to 0.2.2 SHA hash * ./vcpkg x-add-version --all --overwrite-version * [rexo] CONTROL -> vcpkg.json * ./vcpkg x-add-version --all --overwrite-version * [ports/rexo] Use new format * [ports/rexo/vcpkg.json] Remove trailing comma * [versions/r-/rexo.json] ./vcpkg x-add-version rexo --overwrite-version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5service] new port (#19180) * Add kf5service port * Add kf5service port * [kf5service] update to 5.75.0 * [kf5service] update to 5.84.0 * [kf5service] update versions * [kf5service] update to current spec Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5service] use semVer Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5service] wrap paths in quotes Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5service] update versions * [kf5package] only remove what's needed * [kf5package] phrasing, other cleanups * [kf5service] update versions * [kf5service] DISABLE_PARALLEL_CONFIGURE * [kf5service] update versions * [kf5service] add gettext tools dependency * [kf5service] update versions * [kf5service] upstream requires bison >= 3.0 * [kf5service] remove unused dependencies * [kf5service] update versions * [kf5service] remove redundant options * [kf5service] update versions * [kf5service] copy kbuildsycoca5 tool * [kf5service] update versions * [kf5service] fix Windows static builds * [kf5service] update versions * [kf5service] cleanup, iconv was fixed in kf5i18n * [kf5service] update versions * [kf5service] use generic, non-semver versioning * [kf5service] update versions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> * [kf5package] new port (#19195) * Add kf5package port * [kf5package] remove vcpkg-cmake-wrapper block * [kf5package] more fixes * Fixed kf5package for windows * Fixed kf5package for windows (by Kuntal Majumder) * [kf5package] use PORT variable where applicable * [kf5package] update to 5.…
This P/R intentionally makes no manual edits to CONTROLs and thus should not require extensive review.