diff options
| author | ruki <[email protected]> | 2023-08-23 22:45:50 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-08-23 22:45:50 +0800 |
| commit | 8bc2fe44da59c56aaf453daff542db8565d2197c (patch) | |
| tree | d577fd4f56bdd0bd8ffd8c2a27dccedc00b04975 | |
| parent | d95f821dffb5765e7cf74638b07b10ab25521b1d (diff) | |
fix extrafiles #4110
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | xmake/core/project/target.lua | 5 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 952575f3c..1e80a68db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## master (unreleased) +### Bugs fixed + +* [#4110](https://github.com/xmake-io/xmake/issues/4110): Fix extrafiles + ## v2.8.2 ### New features @@ -1632,6 +1636,10 @@ ## master (开发中) +### Bugs 修复 + +* [#4110](https://github.com/xmake-io/xmake/issues/4110): 修复 extrafiles + ## v2.8.2 ### 新特性 diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index aa03fa48a..a537b5986 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -1756,6 +1756,11 @@ function _instance:installfiles(outputdir) return self:_copiedfiles("installfiles", outputdir or self:installdir()) end +-- get the extra files +function _instance:extrafiles() + return (self:_copiedfiles("extrafiles")) +end + -- get depend file from object file function _instance:dependfile(objectfile) diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 6acc09c69..e2389b8ba 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -530,7 +530,7 @@ function make(outputdir, vsinfo) -- save all sourcefiles and headerfiles _target.sourcefiles = table.unique(table.join(_target.sourcefiles or {}, (target:sourcefiles()))) _target.headerfiles = table.unique(table.join(_target.headerfiles or {}, (target:headerfiles()))) - _target.extrafiles = table.unique(table.join(_target.extrafiles or {}, (target:get("extrafiles")))) + _target.extrafiles = table.unique(table.join(_target.extrafiles or {}, (target:extrafiles()))) -- sort them to stabilize generation table.sort(_target.sourcefiles) diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 2c3829284..4e318fdcf 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -496,7 +496,7 @@ function main(outputdir, vsinfo) -- save all sourcefiles and headerfiles _target.sourcefiles = table.unique(table.join(_target.sourcefiles or {}, (target:sourcefiles()))) _target.headerfiles = table.unique(table.join(_target.headerfiles or {}, (target:headerfiles()))) - _target.extrafiles = table.unique(table.join(_target.extrafiles or {}, (target:get("extrafiles")))) + _target.extrafiles = table.unique(table.join(_target.extrafiles or {}, (target:extrafiles()))) -- sort them to stabilize generation table.sort(_target.sourcefiles) |