From e68e3b9f23336820b04ff74e5b4e9aa2fad0c959 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 12 Jan 2021 23:42:43 +0800 Subject: fix process --- core/src/tbox/tbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox index 3b24fdb96..66a1d88dc 160000 --- a/core/src/tbox/tbox +++ b/core/src/tbox/tbox @@ -1 +1 @@ -Subproject commit 3b24fdb96bccec99b2fbb99f1d6b04f67f249da6 +Subproject commit 66a1d88dc3f137a96bcca2afc2876ea551a54e88 -- cgit v1.3.1 From 7d4ba9ac090622c1e3585229b8f571a40f38c000 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 13 Jan 2021 00:38:07 +0800 Subject: improve find_vstudio --- xmake/modules/detect/sdks/find_vstudio.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index 309b3dd64..f833f304d 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -43,7 +43,6 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt) -- make the genvcvars.bat opt = opt or {} local genvcvars_bat = os.tmpfile() .. "_genvcvars.bat" - local genvcvars_dat = os.tmpfile() .. "_genvcvars.txt" local file = io.open(genvcvars_bat, "w") file:print("@echo off") -- fix error caused by the new vsDevCmd.bat of vs2019 @@ -57,16 +56,19 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt) file:print("call \"%s\" %s %s > nul", vcvarsall, arch, opt.sdkver and opt.sdkver or "") end for idx, var in ipairs(vcvars) do - file:print("echo " .. var .. " = %%" .. var .. "%% %s %s", idx == 1 and ">" or ">>", genvcvars_dat) + file:print("echo " .. var .. " = %%" .. var .. "%%") end file:close() -- run genvcvars.bat - os.run(genvcvars_bat) + local outdata = try {function () return os.iorun(genvcvars_bat) end} + if not outdata then + return + end -- load all envirnoment variables local variables = {} - for _, line in ipairs((io.readfile(genvcvars_dat) or ""):split("\n")) do + for _, line in ipairs(outdata:split("\n")) do local p = line:find('=', 1, true) if p then local name = line:sub(1, p - 1):trim() -- cgit v1.3.1 From 3d07ce3aade93183600c1443175829a5a5fab9aa Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 13 Jan 2021 00:57:02 +0800 Subject: update tbox --- core/src/tbox/tbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox index 66a1d88dc..b65c07068 160000 --- a/core/src/tbox/tbox +++ b/core/src/tbox/tbox @@ -1 +1 @@ -Subproject commit 66a1d88dc3f137a96bcca2afc2876ea551a54e88 +Subproject commit b65c07068e36eec351de7efac2a69332f3c67386 -- cgit v1.3.1 From be039661f2607b4055ded52a626ce904fc854565 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 13 Jan 2021 00:59:59 +0800 Subject: fix ci --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 355d43f6a..290be340e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -149,7 +149,7 @@ jobs: uses: WyriHaximus/github-action-get-previous-tag@master - name: Upload artifacts to lastest release - if: ${{ env.GITHUB_REF_SLUG }} == 'dev' || ${{ env.GITHUB_REF_SLUG }} == 'master' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} -- cgit v1.3.1 From 3bbc5074add71d4f5d864f6cfe02abb6646ac4ac Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 13 Jan 2021 23:07:49 +0800 Subject: improve find_vstudio --- core/src/tbox/tbox | 2 +- xmake/modules/detect/sdks/find_vstudio.lua | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox index b65c07068..6e5fb77c5 160000 --- a/core/src/tbox/tbox +++ b/core/src/tbox/tbox @@ -1 +1 @@ -Subproject commit b65c07068e36eec351de7efac2a69332f3c67386 +Subproject commit 6e5fb77c5ab5c0d712871c52c42a5bc7843cd780 diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index f833f304d..d908bcc5a 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -45,6 +45,9 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt) local genvcvars_bat = os.tmpfile() .. "_genvcvars.bat" local file = io.open(genvcvars_bat, "w") file:print("@echo off") + -- @note we need get utf8 output from cmd.exe + -- because some %PATH% and other envs maybe contains unicode characters + file:print("chcp 65001") -- fix error caused by the new vsDevCmd.bat of vs2019 -- @see https://github.com/xmake-io/xmake/issues/549 if vsver and tonumber(vsver) >= 16 then -- cgit v1.3.1