diff options
| author | ruki <[email protected]> | 2023-08-01 23:38:33 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-08-01 23:38:33 +0800 |
| commit | 0f8899180e72c65ce48b37d30902b20f315bbdb9 (patch) | |
| tree | 44dfb352cdba81453785fb8b592b028b577a2d31 | |
| parent | 589975db619ee3ff5611ea0e1887159dc89e49e4 (diff) | |
remove more codes
| -rw-r--r-- | xmake/actions/build/kinds/shared.lua | 15 | ||||
| -rw-r--r-- | xmake/actions/build/kinds/static.lua | 15 | ||||
| -rw-r--r-- | xmake/modules/target/action/clean/main.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/project/cmake/cmakelists.lua | 18 | ||||
| -rw-r--r-- | xmake/plugins/project/make/makefile.lua | 3 |
5 files changed, 0 insertions, 55 deletions
diff --git a/xmake/actions/build/kinds/shared.lua b/xmake/actions/build/kinds/shared.lua index cc9957ca9..4363d1901 100644 --- a/xmake/actions/build/kinds/shared.lua +++ b/xmake/actions/build/kinds/shared.lua @@ -54,21 +54,6 @@ function _do_link_target(target, opt) local depvalues = {linkinst:program(), linkflags} depend.on_changed(function () - -- TODO make headers (deprecated) - if not dryrun then - local srcheaders, dstheaders = target:headers() - if srcheaders and dstheaders then - local i = 1 - for _, srcheader in ipairs(srcheaders) do - local dstheader = dstheaders[i] - if dstheader then - os.cp(srcheader, dstheader) - end - i = i + 1 - end - end - end - -- the target file local targetfile = target:targetfile() diff --git a/xmake/actions/build/kinds/static.lua b/xmake/actions/build/kinds/static.lua index 644710154..9d9ffdaf9 100644 --- a/xmake/actions/build/kinds/static.lua +++ b/xmake/actions/build/kinds/static.lua @@ -54,21 +54,6 @@ function _do_link_target(target, opt) local depvalues = {linkinst:program(), linkflags} depend.on_changed(function () - -- TODO make headers (deprecated) - if not dryrun then - local srcheaders, dstheaders = target:headers() - if srcheaders and dstheaders then - local i = 1 - for _, srcheader in ipairs(srcheaders) do - local dstheader = dstheaders[i] - if dstheader then - os.cp(srcheader, dstheader) - end - i = i + 1 - end - end - end - -- the target file local targetfile = target:targetfile() diff --git a/xmake/modules/target/action/clean/main.lua b/xmake/modules/target/action/clean/main.lua index d492c38b1..06bd39f70 100644 --- a/xmake/modules/target/action/clean/main.lua +++ b/xmake/modules/target/action/clean/main.lua @@ -53,10 +53,6 @@ function main(target) remove_files(target:pcoutputfile("c")) remove_files(target:pcoutputfile("cxx")) - -- TODO remove the header files (deprecated) - local _, dstheaders = target:headers() - remove_files(dstheaders) - -- remove the clean files remove_files(target:get("cleanfiles")) diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua index 54d87a251..e4cf59e96 100644 --- a/xmake/plugins/project/cmake/cmakelists.lua +++ b/xmake/plugins/project/cmake/cmakelists.lua @@ -1005,21 +1005,6 @@ function _add_target_custom_commands(cmakelists, target, outputdir) _add_target_custom_commands_for_batchcmds(cmakelists, target, outputdir, "after", cmds_after) end --- TODO export target headers (deprecated) -function _export_target_headers(target) - local srcheaders, dstheaders = target:headers() - if srcheaders and dstheaders then - local i = 1 - for _, srcheader in ipairs(srcheaders) do - local dstheader = dstheaders[i] - if dstheader then - os.cp(srcheader, dstheader) - end - i = i + 1 - end - end -end - -- add target function _add_target(cmakelists, target, outputdir) @@ -1044,9 +1029,6 @@ function _add_target(cmakelists, target, outputdir) raise("unknown target kind %s", target:kind()) end - -- TODO export target headers (deprecated) - _export_target_headers(target) - -- add target dependencies _add_target_dependencies(cmakelists, target) diff --git a/xmake/plugins/project/make/makefile.lua b/xmake/plugins/project/make/makefile.lua index cae9806f0..7f2e4f62c 100644 --- a/xmake/plugins/project/make/makefile.lua +++ b/xmake/plugins/project/make/makefile.lua @@ -655,9 +655,6 @@ function _add_clean_target(makefile, target, outputdir) _add_remove_files(makefile, target:targetfile(), outputdir) _add_remove_files(makefile, target:symbolfile(), outputdir) _add_remove_files(makefile, target:objectfiles(), outputdir) - -- TODO remove the header files (deprecated) - local _, dstheaders = target:headers() - _add_remove_files(makefile, dstheaders, outputdir) end makefile:print("") end |
