diff options
| author | OpportunityLiu <[email protected]> | 2019-07-17 19:34:20 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-07-19 11:48:32 +0800 |
| commit | 4ba16a3ce3b556686455378e1f7386508e65d0fb (patch) | |
| tree | bae65df0e46b17acc4681ef3c2af2462271c30a1 | |
| parent | 0c469ed3843a73b3fbf73640b75715f72fc7be53 (diff) | |
add project name
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs200x_solution.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x_solution.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsxmake.lua | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index e5b25c450..dac331ac9 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -24,7 +24,7 @@ import("core.project.config") -- get build directory function _get_buildir() - _g.buildir = _g.buildir or "build_" .. hash.uuid():split('%-')[1] + _g.buildir = _g.buildir or ("build_" .. hash.uuid():split('%-')[1]) return _g.buildir end diff --git a/xmake/plugins/project/vstudio/impl/vs200x_solution.lua b/xmake/plugins/project/vstudio/impl/vs200x_solution.lua index 5653059c5..1333da648 100644 --- a/xmake/plugins/project/vstudio/impl/vs200x_solution.lua +++ b/xmake/plugins/project/vstudio/impl/vs200x_solution.lua @@ -88,7 +88,7 @@ end function make(vsinfo) -- init solution name - vsinfo.solution_name = project.name() or "vs" .. vsinfo.vstudio_version + vsinfo.solution_name = project.name() or ("vs" .. vsinfo.vstudio_version) -- open solution file local slnfile = vsfile.open(path.join(vsinfo.solution_dir, vsinfo.solution_name .. ".sln"), "w") diff --git a/xmake/plugins/project/vstudio/impl/vs201x_solution.lua b/xmake/plugins/project/vstudio/impl/vs201x_solution.lua index d38ac15cf..cfcc20509 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x_solution.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x_solution.lua @@ -96,7 +96,7 @@ end function make(vsinfo) -- init solution name - vsinfo.solution_name = project.name() or "vs" .. vsinfo.vstudio_version + vsinfo.solution_name = project.name() or ("vs" .. vsinfo.vstudio_version) -- open solution file local slnpath = path.join(vsinfo.solution_dir, vsinfo.solution_name .. ".sln") diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 8aba32ba4..ad05c4788 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -241,7 +241,7 @@ function main(outputdir, vsinfo) vsinfo.projectdir = project.directory() vsinfo.sln_projectfile = path.relative(project.file(), vsinfo.solution_dir) local projectfile = path.filename(project.file()) - vsinfo.slnfile = path.filename(project.directory()) + vsinfo.slnfile = project.name() or path.filename(project.directory()) -- write only if not default if projectfile ~= "xmake.lua" then vsinfo.projectfile = projectfile diff --git a/xmake/plugins/project/vsxmake/vsxmake.lua b/xmake/plugins/project/vsxmake/vsxmake.lua index 3443563a9..6fe5bce24 100644 --- a/xmake/plugins/project/vsxmake/vsxmake.lua +++ b/xmake/plugins/project/vsxmake/vsxmake.lua @@ -139,7 +139,7 @@ function make(version) local paramsprovidersln = _buildparams(info) -- write solution file - local sln = path.join(info.solution_dir, info.slnfile .. "_vsxmake" .. info.vstudio_version .. ".sln") + local sln = path.join(info.solution_dir, info.slnfile .. ".sln") io.writefile(sln, render(template_sln, "#([A-Za-z0-9_,%.%*%(%)]+)#", paramsprovidersln)) -- add solution custom file |