[detours,devicenameresolver,dlfcn-win32,duilib,winpcap] add supports …

…expression (microsoft#22776)
HomeMeCEO · Jan 28, 2022 · 16f5411 · 16f5411
1 parent 0a798c0
commit 16f5411
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 69 deletions.
diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake
@@ -11,7 +11,7 @@ vcpkg_from_github(
 )
 
 vcpkg_build_nmake(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     PROJECT_SUBPATH "src"
     PROJECT_NAME "Makefile"
     OPTIONS "PROCESSOR_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"

diff --git a/ports/detours/vcpkg.json b/ports/detours/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "detours",
-  "version-string": "4.0.1",
-  "port-version": 4,
+  "version": "4.0.1",
+  "port-version": 5,
   "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.",
-  "homepage": "https://github.com/microsoft/Detours"
+  "homepage": "https://github.com/microsoft/Detours",
+  "supports": "windows"
 }
diff --git a/ports/devicenameresolver/portfile.cmake b/ports/devicenameresolver/portfile.cmake
@@ -9,20 +9,17 @@ vcpkg_from_bitbucket(
     PATCHES add-string-headfile.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS_DEBUG 
         -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-file(READ ${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h _contents)
-string(REPLACE "__declspec(dllexport)" "" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h "${_contents}")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/DeviceNameResolver.h" "__declspec(dllexport)" "")
 
-file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/devicenameresolver RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/readme.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/devicenameresolver" RENAME copyright)
diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json
@@ -1,6 +1,13 @@
 {
   "name": "devicenameresolver",
   "version-string": "2016-06-26-0850d88fa6",
-  "port-version": 2,
-  "description": "a little library that resolves a path from a (virtual) device name."
+  "port-version": 3,
+  "description": "a little library that resolves a path from a (virtual) device name.",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/dlfcn-win32/portfile.cmake b/ports/dlfcn-win32/portfile.cmake
@@ -8,23 +8,22 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake dlfcn-win32_DEBUG_MODULE)
+file(READ "${CURRENT_PACKAGES_DIR}/debug/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake" dlfcn-win32_DEBUG_MODULE)
 string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" dlfcn-win32_DEBUG_MODULE "${dlfcn-win32_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake "${dlfcn-win32_DEBUG_MODULE}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/dlfcn-win32/dlfcn-win32-targets-debug.cmake" "${dlfcn-win32_DEBUG_MODULE}")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_copy_pdbs()
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
 
 set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
diff --git a/ports/dlfcn-win32/vcpkg.json b/ports/dlfcn-win32/vcpkg.json
@@ -1,7 +1,14 @@
 {
   "name": "dlfcn-win32",
-  "version-string": "1.1.1",
-  "port-version": 5,
+  "version": "1.1.1",
+  "port-version": 6,
   "description": "dlfcn-win32 is an implementation of dlfcn for Windows.",
-  "homepage": "https://github.com/dlfcn-win32/dlfcn-win32"
+  "homepage": "https://github.com/dlfcn-win32/dlfcn-win32",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/duilib/portfile.cmake b/ports/duilib/portfile.cmake
@@ -12,26 +12,25 @@ vcpkg_from_github(
         "enable-unicode-for-vcpkg.patch"
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/DuiLib
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/DuiLib"
     NO_CHARSET_FLAG
 )
 
-vcpkg_build_cmake()
+vcpkg_cmake_build()
 
-file(INSTALL ${SOURCE_PATH}/DuiLib DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
+file(INSTALL "${SOURCE_PATH}/DuiLib" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
 else()
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/duilib/vcpkg.json b/ports/duilib/vcpkg.json
@@ -1,7 +1,14 @@
 {
   "name": "duilib",
-  "version-string": "2019-4-28",
-  "port-version": 4,
+  "version-date": "2019-04-28",
+  "port-version": 5,
   "description": "Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines.",
-  "homepage": "https://github.com/duilib/duilib"
+  "homepage": "https://github.com/duilib/duilib",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "winpcap",
   "version": "4.1.3",
-  "port-version": 6,
+  "port-version": 7,
   "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.",
-  "homepage": "https://www.winpcap.org"
+  "homepage": "https://www.winpcap.org",
+  "supports": "windows"
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -191,12 +191,6 @@ dbghelp:x86-windows=skip
 dcmtk:arm-uwp=fail
 dcmtk:arm64-windows=fail
 dcmtk:x64-uwp=fail
-detours:x64-linux=fail
-detours:x64-osx=fail
-devicenameresolver:arm-uwp=fail
-devicenameresolver:x64-linux=fail
-devicenameresolver:x64-osx=fail
-devicenameresolver:x64-uwp=fail
 devicenameresolver:x64-windows-static=fail
 # legacy directxsdk which conflicts with dxsdk-d3dx
 directxsdk:x86-windows=skip
@@ -205,10 +199,6 @@ discord-game-sdk:x64-windows-static=fail
 discord-game-sdk:x64-windows-static-md=fail
 discord-rpc:arm-uwp=fail
 discord-rpc:x64-uwp=fail
-dlfcn-win32:arm-uwp=fail
-dlfcn-win32:x64-linux=fail
-dlfcn-win32:x64-osx=fail
-dlfcn-win32:x64-uwp=fail
 dmlc:arm-uwp=fail
 dmlc:x64-uwp=fail
 dpdk:arm-uwp=fail
@@ -229,10 +219,6 @@ duckx:x64-windows        = skip
 duckx:x64-windows-static = skip
 duckx:x64-windows-static-md=skip
 duckx:x86-windows        = skip
-duilib:arm-uwp=fail
-duilib:x64-linux=fail
-duilib:x64-osx=fail
-duilib:x64-uwp=fail
 
 # requires python@2 from brew, but that no longer exists
 # python2 EOL yay!
@@ -1362,8 +1348,6 @@ vxl:x86-windows        = skip
 wampcc:arm64-windows=fail
 winpcap:arm64-windows      = skip
 winpcap:arm-uwp            = skip
-winpcap:x64-linux=fail
-winpcap:x64-osx=fail
 winpcap:x64-uwp            = skip
 winpcap:x64-windows        = skip
 winpcap:x64-windows-static = skip

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1806,11 +1806,11 @@
     },
     "detours": {
       "baseline": "4.0.1",
-      "port-version": 4
+      "port-version": 5
     },
     "devicenameresolver": {
       "baseline": "2016-06-26-0850d88fa6",
-      "port-version": 2
+      "port-version": 3
     },
     "devil": {
       "baseline": "1.8.0",
@@ -1874,7 +1874,7 @@
     },
     "dlfcn-win32": {
       "baseline": "1.1.1",
-      "port-version": 5
+      "port-version": 6
     },
     "dlib": {
       "baseline": "19.22",
@@ -1921,8 +1921,8 @@
       "port-version": 1
     },
     "duilib": {
-      "baseline": "2019-4-28",
-      "port-version": 4
+      "baseline": "2019-04-28",
+      "port-version": 5
     },
     "duktape": {
       "baseline": "2.5.0",
@@ -7302,7 +7302,7 @@
     },
     "winpcap": {
       "baseline": "4.1.3",
-      "port-version": 6
+      "port-version": 7
     },
     "winpty": {
       "baseline": "0.4.3",

diff --git a/versions/d-/detours.json b/versions/d-/detours.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9dc31719cf3c251f0530bf8ddb5c6131590386da",
+      "version": "4.0.1",
+      "port-version": 5
+    },
     {
       "git-tree": "5399f9185e9e7d815bf3c8380e745b5be77c2258",
       "version-string": "4.0.1",

diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1",
+      "version-string": "2016-06-26-0850d88fa6",
+      "port-version": 3
+    },
     {
       "git-tree": "1c24f08a86eef969a65c6acdd123edfe704c4c0c",
       "version-string": "2016-06-26-0850d88fa6",

diff --git a/versions/d-/dlfcn-win32.json b/versions/d-/dlfcn-win32.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ae0dd5fc5f29e2299690404410ce7129ec5c035",
+      "version": "1.1.1",
+      "port-version": 6
+    },
     {
       "git-tree": "37cc87e9f214e146c81fff2a8aa5ae018622674d",
       "version-string": "1.1.1",

diff --git a/versions/d-/duilib.json b/versions/d-/duilib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "36c7ba26c4af9fabce94dfb4a2ffe87b7b7467c0",
+      "version-date": "2019-04-28",
+      "port-version": 5
+    },
     {
       "git-tree": "c23619497c06f6d2e22dae79e731c2a7da51208c",
       "version-string": "2019-4-28",

diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8b3f6f5a5e85be5df29d86d4e8e1621a9f3369f4",
+      "version": "4.1.3",
+      "port-version": 7
+    },
     {
       "git-tree": "12c456f2d3fc78f821ff85ac7bb55d89ce140ed6",
       "version": "4.1.3",