After the change of h2, recompile cpp2 containing this h2 #4950
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
waruqi
reviewed
Apr 9, 2024
xmake/rules/cppfront/xmake.lua
Outdated
| @@ -21,8 +21,7 @@ | |||
| rule("cppfront.build.h2") | |||
| set_extensions(".h2") | |||
|
|
|||
| on_buildcmd_file(function (target, batchcmds, sourcefile_h2, opt) | |||
|
|
|||
| before_buildcmd_file(function (target, batchcmds, sourcefile_h2, opt) | |||
There was a problem hiding this comment.
为啥这里改成 before? 只要 rule 加了 add_deps order=true，按理，on_buildcmd_file 也是优先执行的。
waruqi
reviewed
Apr 9, 2024
xmake/rules/cppfront/xmake.lua
Outdated
| -- add_depfiles for #include "xxxx/xxxx/xxx.h2" ,exclude // #include "xxxx.h2" | ||
| local lines = io.lines(sourcefile_cpp2) | ||
| for line in lines do | ||
| match_h2 = string.match(line, "^ -#include *\"([%w%p]+.h2)\"") |
waruqi
reviewed
Apr 9, 2024
xmake/rules/cppfront/xmake.lua
Outdated
| @@ -78,6 +76,14 @@ rule("cppfront.build.cpp2") | |||
| local objectfile = target:objectfile(sourcefile_cpp) | |||
| table.insert(target:objectfiles(), objectfile) | |||
|
|
|||
| -- add_depfiles for #include "xxxx/xxxx/xxx.h2" ,exclude // #include "xxxx.h2" | |||
| local lines = io.lines(sourcefile_cpp2) | |||
There was a problem hiding this comment.
cppfront 现在没有头文件分析的 flags 支持么？类似 -MD 啥的
|
另外，下次记得提到 dev 分支，不要直接提 master |
Also, remember to mention the dev branch next time instead of master directly. |
waruqi
reviewed
Apr 9, 2024
xmake/rules/cppfront/xmake.lua
Outdated
| -- add_depfiles for #include "xxxx/xxxx/xxx.h2" ,exclude // #include "xxxx.h2" | ||
| local lines = io.lines(sourcefile_cpp2) | ||
| for line in lines do | ||
| match_h2 = line:match("^ -#include *\"([%w%p]+.h2)\"") |
waruqi
reviewed
Apr 9, 2024
xmake/rules/cppfront/xmake.lua
Outdated
| for line in lines do | ||
| match_h2 = line:match("^ -#include *\"([%w%p]+.h2)\"") | ||
| if match_h2 ~= nil then | ||
| batchcmds:add_depfiles(path.join(path.directory(sourcefile_cpp2), match_h2)) |
There was a problem hiding this comment.
可以搞个 rootdir 放到 loop 外，避免每次去 dir 一遍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
修复h2变化，依赖的cpp2没变化的时候，cpp2不重新编译的问题，并且将h2改为before_buildcmd_file #4938