From 1af48f3719c04da3032079bf4e3757bb34482533 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Thu, 10 Feb 2022 12:58:57 +0100 Subject: Fix vs generator config --- xmake/plugins/project/vstudio/impl/vs201x.lua | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 2595b19e0..39c90c409 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -96,6 +96,10 @@ function _clear_cache() localcache.clear("option") localcache.clear("package") localcache.clear("toolchain") + + -- force recheck + localcache.set("config", "recheck", true) + localcache.save() end @@ -314,9 +318,9 @@ function _make_targetinfo(mode, arch, target, vcxprojdir) end for k, v in pairs(addrunenvs) do if k:upper() == "PATH" then - runenvs[k] = _make_dirs(v, vcxprojdir) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" + runenvs[k] = _make_dirs(v, vcxprojdir) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" else - runenvs[k] = path.joinenv(v) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" + runenvs[k] = path.joinenv(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" end end for k, v in pairs(setrunenvs) do @@ -499,7 +503,6 @@ function make(outputdir, vsinfo) -- load targets local targets = {} - local configdata = io.readfile(config.filepath()) for mode_idx, mode in ipairs(vsinfo.modes) do for arch_idx, arch in ipairs(vsinfo.archs) do @@ -592,11 +595,6 @@ function make(outputdir, vsinfo) -- clear local cache _clear_cache() - -- restore previous config data - if configdata then - io.writefile(config.filepath(), configdata) - end - -- leave project directory os.cd(oldir) end -- cgit v1.3.1 From e4ad23a7573fe6997ad815eafc89da572bf0ad62 Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Thu, 10 Feb 2022 13:14:09 +0100 Subject: Don't clear localcache("config") --- xmake/plugins/project/vstudio/impl/vs201x.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 39c90c409..f57a407ab 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -91,7 +91,6 @@ end -- clear cache function _clear_cache() - localcache.clear("config") localcache.clear("detect") localcache.clear("option") localcache.clear("package") -- cgit v1.3.1 From 3ff42f15a6bd176b5bc20d95836c024637ecedad Mon Sep 17 00:00:00 2001 From: Jérôme Leclercq Date: Thu, 10 Feb 2022 13:16:41 +0100 Subject: vsproject: don't clear localcache("config") --- xmake/plugins/project/vstudio/impl/vs201x.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index f57a407ab..b72827e0b 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -523,7 +523,6 @@ function make(outputdir, vsinfo) -- clear cache memcache.clear() - localcache.clear("config") localcache.clear("detect") localcache.clear("option") localcache.clear("package") -- cgit v1.3.1