diff options
| author | anaaru <80126804+anaaru@users.noreply.github.com> | 2021-03-10 11:29:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-10 13:29:45 -0600 |
| commit | f5bfe6dc188f26d541f57333dc74922f9801a70a (patch) | |
| tree | b81d9d6537109cc451ba0b0dac002d1d1937fdf7 | |
| parent | 37a8f411636714b2752d756570070a67c2ad8518 (diff) | |
| download | vcpkg-f5bfe6dc188f26d541f57333dc74922f9801a70a.tar.gz vcpkg-f5bfe6dc188f26d541f57333dc74922f9801a70a.zip | |
[wil] Updating WIL version to match its nuget package version (#16575)
* [wil] Updating WIL version to match its nuget package version
* Removing port version from CONTROL file
* Revert "Removing port version from CONTROL file"
Reverting because PR tests are failing.
This reverts commit 28ffcba04b3d053e9a01d965fab951eafa64449b.
* Updating baseline.json and w-/wil.json
* update version
* modify portfile.cmake
* update version
Co-authored-by: Anand Arumugam <anand.arumug@gmail.com>
Co-authored-by: Anand Arumugam <anaaru@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
| -rw-r--r-- | ports/wil/CONTROL | 3 | ||||
| -rw-r--r-- | ports/wil/fix-install-headers.patch | 12 | ||||
| -rw-r--r-- | ports/wil/portfile.cmake | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/w-/wil.json | 5 |
5 files changed, 11 insertions, 20 deletions
diff --git a/ports/wil/CONTROL b/ports/wil/CONTROL index 7d0e94202..04acb2d1f 100644 --- a/ports/wil/CONTROL +++ b/ports/wil/CONTROL @@ -1,5 +1,4 @@ Source: wil
-Version: 2020-05-19
-Port-Version: 1
+Version: 2021-02-04
Homepage: https://github.com/microsoft/wil
Description: The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.
diff --git a/ports/wil/fix-install-headers.patch b/ports/wil/fix-install-headers.patch deleted file mode 100644 index ae0e3aef3..000000000 --- a/ports/wil/fix-install-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 97a6737..4ae28fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,4 +48,4 @@ install(EXPORT ${PROJECT_NAME}_targets - ) - - # Install the headers at a standard cmake location. --install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -\ No newline at end of file -+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/wil" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -\ No newline at end of file diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index d5fb8e7e0..79011e711 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/wil
- REF 3c00e7f1d8cf9930bbb8e5be3ef0df65c84e8928
- SHA512 c9c3b4a41f7523a6da6378def4a6b868e9f66438998d04ae8489b9784db91664af7af3ab6ef73c104b9ac100c0dc5ae6a13e9cb9f679ba428a4abc07b32a7dce
+ REF 86353933d5fba0caf61503c8b09e10e182dccdfb
+ SHA512 07694a3754c179aa629b8e3e8fc2a5554779601925131bffef311dee937b03db0d1be891eaee364b7a265b7268f39ad356d8302c02b05acf4fa8c7b2d4d51629
HEAD_REF master
- PATCHES fix-install-headers.patch
)
vcpkg_configure_cmake(
@@ -22,4 +21,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/WIL) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wil" RENAME copyright)
\ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file diff --git a/versions/baseline.json b/versions/baseline.json index 2e1a2a091..27cb3afd2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6217,8 +6217,8 @@ "port-version": 0 }, "wil": { - "baseline": "2020-05-19", - "port-version": 1 + "baseline": "2021-02-04", + "port-version": 0 }, "wildmidi": { "baseline": "0.4.3-1", diff --git a/versions/w-/wil.json b/versions/w-/wil.json index 76614119d..012bcfe15 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "1085a9ee690f6718715b28396f5250ad67d6f828", + "version-string": "2021-02-04", + "port-version": 0 + }, + { "git-tree": "48d7b90ae1c7d5f223caad5330a293463f470860", "version-string": "2020-05-19", "port-version": 1 |