Skip to content

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

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.

Sign up for GitHub

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

Merged
BillyONeal merged 4 commits into from
Jun 27, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3f2534
[msquic] Rename from ms-quic and remove the tools feature.
BillyONeal Jun 25, 2024
9c0b381
Temp move msquic
BillyONeal Jun 27, 2024
5511199
Merge branch 'temp' into remove-msquic-tools
BillyONeal Jun 27, 2024
40b8266
Fix whitespace
BillyONeal Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...mparing-system-processor-with-win32.patch → ...mparing-system-processor-with-win32.patch
View file
Open in desktop
File renamed without changes.
19 changes: 3 additions & 16 deletions ports/ms-quic/fix-install.patch → ports/msquic/fix-install.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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()
Expand All @@ -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)
0 ports/ms-quic/fix-uwp-crt.patch → ports/msquic/fix-uwp-crt.patch
View file
Open in desktop
File renamed without changes.
24 changes: 5 additions & 19 deletions ports/ms-quic/portfile.cmake → ports/msquic/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
11 changes: 2 additions & 9 deletions ports/ms-quic/vcpkg.json → ports/msquic/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -15,11 +14,5 @@
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"tools": {
"description": "Install the tools after build",
"supports": "!uwp"
}
}
]
}
8 changes: 4 additions & 4 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions versions/m-/msquic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
Copy link
Copy Markdown
Contributor

@IldarKhayrutdinov IldarKhayrutdinov Jul 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems needs to delete versions/m-/ms-quic.json

Copy link
Copy Markdown
Contributor

@WangWeiLin-MV WangWeiLin-MV Jul 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to preserve the version database to allow using older versions in manifest mode.

"versions": [
{
"git-tree": "20a3ca5768fb1bb7781563159dc5400b0b2bb978",
"version": "2.3.5",
"port-version": 0
}
]
}