Skip to content

Commit

Permalink
[unrar/mdnsresponder] only windows (microsoft#22643)
Browse files Browse the repository at this point in the history
* unrar only support windows

* update

* update

* mdnsresponder only support windows

* --amend

* add !uwp to supports

* add !arm64 to supports

* Update ports/mdnsresponder/vcpkg.json

Co-authored-by: nicole mazzuca <[email protected]>
  • Loading branch information
Adela0814 and strega-nil-ms authored Jan 20, 2022
1 parent 43966c5 commit 89c4fdf
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 25 deletions.
2 changes: 0 additions & 2 deletions ports/mdnsresponder/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
vcpkg_fail_port_install(ON_ARCH "arm")

vcpkg_download_distfile(ARCHIVE
URLS https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.270.2.tar.gz
FILENAME mDNSResponder-878.270.2.tar.gz
Expand Down
3 changes: 2 additions & 1 deletion ports/mdnsresponder/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "mdnsresponder",
"version": "878.270.2",
"port-version": 1,
"description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.",
"homepage": "https://developer.apple.com/bonjour/",
"supports": "!arm"
"supports": "windows & !uwp & !arm"
}
12 changes: 6 additions & 6 deletions ports/unrar/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ vcpkg_build_msbuild(
)

#INCLUDE (named dll.hpp in source, and unrar.h in all rarlabs distributions)
file(INSTALL ${SOURCE_PATH}/dll.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME unrar.h)
file(INSTALL "${SOURCE_PATH}/dll.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME unrar.h)

#DLL & LIB
file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/unrar.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/unrar.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")

vcpkg_copy_pdbs()

#COPYRIGHT
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/unrar RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
7 changes: 4 additions & 3 deletions ports/unrar/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "unrar",
"version-string": "5.8.1",
"port-version": 1,
"version": "5.8.1",
"port-version": 2,
"description": "rarlab's unrar library",
"homepage": "https://www.rarlab.com"
"homepage": "https://www.rarlab.com",
"supports": "windows & !uwp & !arm & !static"
}
11 changes: 0 additions & 11 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -774,11 +774,6 @@ marl:arm-uwp=fail
marl:x64-uwp=fail
mathgl:x64-osx=fail
mathgl:x64-uwp=fail
mdnsresponder:arm64-windows=fail
mdnsresponder:arm-uwp=fail
mdnsresponder:x64-linux=fail
mdnsresponder:x64-osx=fail
mdnsresponder:x64-uwp=fail
mecab:arm64-windows = skip
mecab:arm-uwp = skip
mecab:x64-linux = skip
Expand Down Expand Up @@ -1438,12 +1433,6 @@ unixodbc:x64-windows=fail
unixodbc:x64-windows-static=fail
unixodbc:x64-windows-static-md=fail
unixodbc:x86-windows=fail
unrar:arm64-windows=fail
unrar:arm-uwp=fail
unrar:x64-linux=fail
unrar:x64-osx=fail
unrar:x64-uwp=fail
unrar:x64-windows-static=fail
urdfdom:x64-windows-static=fail
usd:x86-windows=fail
uthenticode:arm-uwp=fail
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4346,7 +4346,7 @@
},
"mdnsresponder": {
"baseline": "878.270.2",
"port-version": 0
"port-version": 1
},
"mdspan": {
"baseline": "2021-11-03",
Expand Down Expand Up @@ -7058,7 +7058,7 @@
},
"unrar": {
"baseline": "5.8.1",
"port-version": 1
"port-version": 2
},
"upb": {
"baseline": "2021-10-19",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mdnsresponder.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3a57c5a00a432c5f54ca26ddf0a1ea7298364e55",
"version": "878.270.2",
"port-version": 1
},
{
"git-tree": "0feece31cd1ade61b7f16a0a23880d3b29ad3eb4",
"version": "878.270.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/u-/unrar.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4d39c9643a67338a3252672f3c5910891c6a87cd",
"version": "5.8.1",
"port-version": 2
},
{
"git-tree": "31f7c1900da6148793b6b10c1b7be7b5e80d4172",
"version-string": "5.8.1",
Expand Down

0 comments on commit 89c4fdf

Please sign in to comment.