[msquic] Rename from ms-quic and remove the tools feature. (#39500)

microsoft · Jun 27, 2024 · c247b81 · c247b81
1 parent 85782ff
commit c247b81
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 48 deletions.
diff --git a/...mparing-system-processor-with-win32.patch → ...mparing-system-processor-with-win32.patch b/...mparing-system-processor-with-win32.patch → ...mparing-system-processor-with-win32.patch
diff --git a/ports/ms-quic/fix-install.patch → ports/msquic/fix-install.patch b/ports/ms-quic/fix-install.patch → ports/msquic/fix-install.patch
@@ -1,16 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0c89c5c..98bb1a6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -752,6 +752,8 @@ add_subdirectory(src/bin)
- # Tool code
- if(QUIC_BUILD_TOOLS)
-     add_subdirectory(src/tools)
-+    install(TARGETS quicattack quicinterop quicinteropserver quicipclient quicipserver
-+                    quicpcp quicpost quicsample spinquic)
- endif()
-
- # Performance code
 diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
 index 2376823..d0592a3 100644
 --- a/src/bin/CMakeLists.txt
@@ -31,12 +18,12 @@ index 2376823..d0592a3 100644
 -        $<INSTALL_INTERFACE:${include_dest}>)
 +        $<INSTALL_INTERFACE:include>)
  endif()
-
+ 
  set(PUBLIC_HEADERS
 @@ -269,11 +269,10 @@ set(PUBLIC_HEADERS
      ../inc/msquic_posix.h
      ../inc/quic_sal_stub.h)
-
+ 
 -if(BUILD_SHARED_LIBS)
 -  install(TARGETS msquic EXPORT msquic DESTINATION lib)
 -else()
@@ -47,5 +34,5 @@ index 2376823..d0592a3 100644
 +    ARCHIVE DESTINATION lib
 +    LIBRARY DESTINATION lib)
  install(FILES ${PUBLIC_HEADERS} DESTINATION include)
-
+ 
  configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake)
diff --git a/ports/ms-quic/fix-uwp-crt.patch → ports/msquic/fix-uwp-crt.patch b/ports/ms-quic/fix-uwp-crt.patch → ports/msquic/fix-uwp-crt.patch
diff --git a/ports/ms-quic/portfile.cmake → ports/msquic/portfile.cmake b/ports/ms-quic/portfile.cmake → ports/msquic/portfile.cmake
@@ -48,23 +48,17 @@ if(NOT VCPKG_HOST_IS_WINDOWS)
     vcpkg_add_to_path(PREPEND "${MAKE_EXE_PATH}")
 endif()
 
- if(VCPKG_TARGET_IS_WINDOWS)
-     vcpkg_find_acquire_program(NASM)
-     get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY)
-     vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
- endif()
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        tools QUIC_BUILD_TOOLS
-)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_find_acquire_program(NASM)
+    get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY)
+    vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}")
+endif()
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${QUIC_SOURCE_PATH}"
     OPTIONS
-        ${FEATURE_OPTIONS}
         -DQUIC_SOURCE_LINK=OFF
         -DQUIC_TLS=openssl
         -DQUIC_USE_SYSTEM_LIBCRYPTO=OFF
@@ -76,14 +70,6 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-
-if("tools" IN_LIST "FEATURES")
-    vcpkg_copy_tools(TOOL_NAMES quicattack quicinterop quicinteropserver quicipclient quicipserver
-                                quicpcp quicpost quicsample spinquic
-        AUTO_CLEAN
-    )
-endif()
-
 vcpkg_install_copyright(FILE_LIST "${QUIC_SOURCE_PATH}/LICENSE")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
                     "${CURRENT_PACKAGES_DIR}/debug/include"

diff --git a/ports/ms-quic/vcpkg.json → ports/msquic/vcpkg.json b/ports/ms-quic/vcpkg.json → ports/msquic/vcpkg.json
@@ -1,7 +1,6 @@
 {
-  "name": "ms-quic",
+  "name": "msquic",
   "version": "2.3.5",
-  "port-version": 1,
   "description": "Cross-platform, C implementation of the IETF QUIC protocol",
   "homepage": "https://github.com/microsoft/msquic",
   "license": "MIT",
@@ -15,11 +14,5 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ],
-  "features": {
-    "tools": {
-      "description": "Install the tools after build",
-      "supports": "!uwp"
-    }
-  }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5960,10 +5960,6 @@
       "baseline": "0.43.1",
       "port-version": 0
     },
-    "ms-quic": {
-      "baseline": "2.3.5",
-      "port-version": 1
-    },
     "msdfgen": {
       "baseline": "1.12",
       "port-version": 0
@@ -5992,6 +5988,10 @@
       "baseline": "10.1.12498",
       "port-version": 4
     },
+    "msquic": {
+      "baseline": "2.3.5",
+      "port-version": 0
+    },
     "mstch": {
       "baseline": "1.0.2",
       "port-version": 5

diff --git a/versions/m-/msquic.json b/versions/m-/msquic.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "20a3ca5768fb1bb7781563159dc5400b0b2bb978",
+      "version": "2.3.5",
+      "port-version": 0
+    }
+  ]
+}