-

Author: dayu521

.github/workflows/windows.yml

@@ -46,7 +46,7 @@ jobs:
         if: steps.cache-xmake.outputs.cache-hit != 'true'
         run: |
             # xmake g --pkg_installdir=./cache/.xmake/packages
-            xmake f -vD -y 
+            xmake f -vD -y --github_action=true
         
       - name: Build
         run: |

src/dns.cpp

@@ -61,6 +61,9 @@ namespace hcpp
         awaitable<void> async_resolve(std::shared_ptr<channel> cc, host_edp hedp);
 
         void remove(host_edp hedp);
+
+        //BUG 析构时使用锁
+        ~slow_dns_imp()=default;
     };
     namespace
     {

src/https/ssl_socket_wrap.cpp

@@ -227,7 +227,7 @@ namespace hcpp
         }
     }
 
-    void ssl_sock_mem::set_verify_callback(verify_callback cb, std::optional<string> verify_path)
+    void ssl_sock_mem::set_verify_callback(verify_callback cb, std::optional<std::string> verify_path)
     {
         if (!verify_path)
         {

src/https/ssl_socket_wrap.h

@@ -59,7 +59,7 @@ namespace hcpp
         void set_sni(std::string sni);
         void close_sni();
         using verify_callback = std::function<bool(bool, ssl::verify_context &)>;
-        void set_verify_callback(verify_callback cb,std::optional<string> verify_path=std::nullopt);
+        void set_verify_callback(verify_callback cb,std::optional<std::string> verify_path=std::nullopt);
 
     public:
         ~ssl_sock_mem();

xmake.lua

@@ -6,13 +6,21 @@ set_warnings("all")
 
 set_languages("c++20")
 
+option("github_action")
+
+local lsf_url="https://gitee.com/californiacat/lsf.git"
+
+if has_config("github_action") then
+    lsf_url="https://github.com/dayu521/lsf.git"
+end
+
 -- 设置代理镜像
 -- xmake g --proxy_pac=github_mirror.lua
 -- https://xmake.io/#/zh-cn/package/remote_package?id=%e4%bd%bf%e7%94%a8%e8%87%aa%e5%bb%ba%e7%a7%81%e6%9c%89%e5%8c%85%e4%bb%93%e5%ba%93
 package("lsf")
-    set_homepage("https://gitee.com/californiacat/lsf.git")
+    set_homepage(lsf_url)
     set_description("json.")
-    set_urls("https://gitee.com/californiacat/lsf.git")
+    set_urls(lsf_url)
     -- set_sourcedir(path.join(os.scriptdir(), "lib/lsf"))
 
     on_install(function (package)
@@ -31,20 +39,14 @@ if is_os("windows") then
     -- add_defines("HCPP_XMAKE_WINDOWS")
 
     add_requires("asio 1.28.0",{verify = false})
-    add_requires("openssl3",{verify = false},{system = false})
+    add_requires("openssl3",{verify = false})
     add_requires("lsf")
     openssl_package_name = "openssl3"
     platform_cpp_file="src/os/windows.cpp"
 
-    -- option("openssl_no_sys")
-    --     set_default(false)
-    --     after_check(function (option)
-    --         if option:enabled() then
-    --             add_requireconfs(openssl_package_name,{system = false})
-    --         end
-    --     end)
-        
-    -- add_options("openssl_no_sys")
+    if has_config("github_action") then
+        add_requireconfs(openssl_package_name,{system = false})
+    end
 else
     set_allowedmodes("debug")
     set_defaultmode("debug")
@@ -111,4 +113,8 @@ target("a_test")
 --     set_formats("srczip", "srctargz")
 --     add_sourcefiles("(./**)")
 
--- includes("test")
+includes("@builtin/xpack")
+xpack("hcpp")
+    set_formats("zip")
+    add_installfiles("src/hcpp-cfg.json",{prefixdir = "bin"})
+    add_targets("hcpp")