Skip to content

Commit a2e5c19

Browse files
committed
Prepare release 4.2.2
1 parent 1dc92e9 commit a2e5c19

File tree

6 files changed

+37
-24
lines changed

6 files changed

+37
-24
lines changed

1k/fetch.cmake

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,21 @@ function(_1kfetch_init)
1919
set(_1kfetch_manifest "${_1kfetch_manifest}" CACHE STRING "" FORCE)
2020
endif()
2121

22-
execute_process(COMMAND ${PWSH_PROG} ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/fetchurl.ps1
22+
execute_process(COMMAND ${PWSH_PROG} ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/resolv_uri.ps1
2323
-name "1kdist"
2424
-manifest ${_1kfetch_manifest}
2525
OUTPUT_VARIABLE _1kdist_url
2626
)
27-
string(REPLACE "#" ";" _1kdist_url ${_1kdist_url})
28-
list(GET _1kdist_url 0 _1kdist_base_url)
29-
list(GET _1kdist_url 1 _1kdist_ver)
30-
set(_1kdist_base_url "${_1kdist_base_url}/${_1kdist_ver}" PARENT_SCOPE)
31-
set(_1kdist_ver ${_1kdist_ver} PARENT_SCOPE)
27+
28+
if(_1kdist_url)
29+
string(REPLACE "#" ";" _1kdist_url ${_1kdist_url})
30+
list(GET _1kdist_url 0 _1kdist_base_url)
31+
list(GET _1kdist_url 1 _1kdist_ver)
32+
set(_1kdist_base_url "${_1kdist_base_url}/${_1kdist_ver}" PARENT_SCOPE)
33+
set(_1kdist_ver ${_1kdist_ver} PARENT_SCOPE)
34+
else()
35+
message(WARNING "Resolve 1kdist uri fail, the _1kfetch_dist will not work")
36+
endif()
3237
endfunction()
3338

3439
# fetch prebuilt from 1kdist

1k/fetchurl.ps1

Lines changed: 0 additions & 14 deletions
This file was deleted.

1k/resolv_uri.ps1

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# fetch repo url by name
2+
param(
3+
$name,
4+
$manifest_file
5+
)
6+
7+
if(Test-Path $manifest_file -PathType Leaf) {
8+
$mirror = if (!(Test-Path (Join-Path $PSScriptRoot '.gitee') -PathType Leaf)) {'github'} else {'gitee'}
9+
$url_base = @{'github' = 'https://github.com/'; 'gitee' = 'https://gitee.com/' }[$mirror]
10+
11+
$manifest_map = ConvertFrom-Json (Get-Content $manifest_file -raw)
12+
$ver = $manifest_map.versions.PSObject.Properties[$name].Value
13+
$url_path = $manifest_map.mirrors.PSObject.Properties[$mirror].Value.PSObject.Properties[$name].Value
14+
15+
Write-Host "$url_base$url_path#$ver" -NoNewline
16+
}

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
yasio-4.2.2
2+
3+
1. Fix c++23 deprecated std::aligned_storage warning
4+
2. Ensure WSAStartup before initializing user static variables
5+
6+
17
yasio-4.2.1
28

39
1. Fix #441 socket.bind always fail with EPERM when runs on macos in code signing sandbox mode
4-
5-
10+
11+
612
yasio-4.2.0
713

814
1. Improve kcp implementation

yasio.pc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ includedir=${exec_prefix}/include
55

66
Name: yasio
77
Description: A multi-platform support c++11 library with focus on asio (asynchronous socket I/O) for any client application.
8-
Version: 4.2.1
8+
Version: 4.2.2
99
Libs: -L${libdir}
1010
Cflags: -I${includedir}/yasio

yasio/config.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ SOFTWARE.
205205
/*
206206
** The yasio version macros
207207
*/
208-
#define YASIO_VERSION_NUM 0x040201
208+
#define YASIO_VERSION_NUM 0x040202
209209

210210
/*
211211
** The macros used by io_service.

0 commit comments

Comments
 (0)