diff options
Diffstat (limited to 'xmake')
| -rw-r--r-- | xmake/actions/package/local/main.lua | 3 | ||||
| -rw-r--r-- | xmake/modules/net/proxy.lua | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/xmake/actions/package/local/main.lua b/xmake/actions/package/local/main.lua index d4b776a00..c2b3c556c 100644 --- a/xmake/actions/package/local/main.lua +++ b/xmake/actions/package/local/main.lua @@ -67,6 +67,7 @@ function _package_library(target) local packagedir = path.join(outputdir, "packages", packagename:sub(1, 1), packagename) local binarydir = path.join(packagedir, target:plat(), target:arch(), config.mode(), "bin") local librarydir = path.join(packagedir, target:plat(), target:arch(), config.mode(), "lib") + local headerdir = path.join(packagedir, target:plat(), target:arch(), config.mode(), "include") -- copy the library file to the output directory local targetfile = target:targetfile() @@ -86,7 +87,7 @@ function _package_library(target) end -- copy headers - local srcheaders, dstheaders = target:headerfiles(path.join(packagedir, "include")) + local srcheaders, dstheaders = target:headerfiles(headerdir) if srcheaders and dstheaders then local i = 1 for _, srcheader in ipairs(srcheaders) do diff --git a/xmake/modules/net/proxy.lua b/xmake/modules/net/proxy.lua index 8259a07c9..6aac4af4c 100644 --- a/xmake/modules/net/proxy.lua +++ b/xmake/modules/net/proxy.lua @@ -108,7 +108,7 @@ function config(url) -- enable proxy for the given url and configuration pattern if url then - -- get proxy from the given hosts pattern + -- filter proxy host from the given hosts pattern local host = url:match("://(.-)/") or url:match("@(.-):") local proxy_hosts = _proxy_hosts() if host and proxy_hosts then @@ -121,11 +121,13 @@ function config(url) end end - -- get proxy from the pac file + -- filter proxy host from the pac file local proxy_pac = _proxy_pac() - if proxy_pac and _is_callable(proxy_pac) and proxy_pac(url, host) then + if proxy_pac and host and _is_callable(proxy_pac) and proxy_pac(url, host) then return global.get("proxy") end + + -- use global proxy if not proxy_pac and not proxy_hosts then return global.get("proxy") end |