Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: allow skip including headers of annootations #394

Merged

Conversation

Decodetalkers
Copy link
Contributor

Log:
Issue: linuxdeepin/dtk#147

@Decodetalkers Decodetalkers marked this pull request as draft November 24, 2023 03:40
deepin-ci-robot added a commit to linuxdeepin/dtk6core that referenced this pull request Nov 24, 2023
Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#394
@Decodetalkers Decodetalkers requested a review from a team November 24, 2023 03:41
deepin-ci-robot added a commit to linuxdeepin/dtk6core that referenced this pull request Nov 24, 2023
Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#394
@asterwyx
Copy link
Contributor

commit message里面有typo

deepin-ci-robot added a commit to linuxdeepin/dtk6core that referenced this pull request Nov 28, 2023
Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#394
kegechen pushed a commit to linuxdeepin/dtk6core that referenced this pull request Nov 28, 2023
Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#394
@Decodetalkers Decodetalkers marked this pull request as ready for review December 4, 2023 07:31
@Decodetalkers Decodetalkers force-pushed the skipincludeannotations branch from 29123e8 to 9ac28fb Compare December 4, 2023 07:31
@kegechen kegechen requested a review from zccrs December 4, 2023 07:36
@kegechen
Copy link
Contributor

kegechen commented Dec 4, 2023

/+1

for (const QString &annotation : annotations) {
if (annotation.indexOf('<') == -1) {
hs << "#include \"types/" << annotation.toLower() << ".h\"" << endl;
if (!skipIncludeAnnotations) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看下面还有对annotations进行处理的逻辑,是不是需要一起跳过,
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

下面是处理类型,这里需要跳过的是处理include,下面是原本没有fix的工具的逻辑

Copy link
Contributor

@18202781743 18202781743 Dec 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

include都跳过了,类型处理不跳过么?会不会出现类型不识别的问题,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

qt的工具是要求所有类型都放在-I的头文件的,我们为了方便把类型分开成各个头文件了

18202781743
18202781743 previously approved these changes Dec 8, 2023
Copy link
Member

@zccrs zccrs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个命名可以改一下,其它没有问题

@@ -33,6 +33,11 @@ function(dtk_add_dbus_interface _sources _interface _relativename)
set(_params -m)
endif()

get_source_file_property(_skipincludeannotations ${_interface} SKIP_INCLUDEANNOTATIONS)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SKIP_INCLUDE_ANNOTATIONS

@Decodetalkers Decodetalkers force-pushed the skipincludeannotations branch 2 times, most recently from 6cc2e54 to bd75921 Compare December 11, 2023 03:46
deepin-ci-robot added a commit to linuxdeepin/dtk6core that referenced this pull request Dec 11, 2023
Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#394
deepin-ci-robot added a commit to linuxdeepin/dtk6core that referenced this pull request Dec 11, 2023
Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#394
@asterwyx
Copy link
Contributor

如果想要应用新的workflow文件,需要重新force-push一下,等workflow准备好之后force-push一下吧

deepin-ci-robot added a commit to linuxdeepin/dtk6core that referenced this pull request Dec 14, 2023
Synchronize source files from linuxdeepin/dtkcore.

Source-pull-request: linuxdeepin/dtkcore#394
@deepin-bot
Copy link
Contributor

deepin-bot bot commented Dec 14, 2023

Doc Check bot
🟢 Document Coverage Check Passed!

@Decodetalkers Decodetalkers requested a review from zccrs December 14, 2023 07:33
@Decodetalkers
Copy link
Contributor Author

@zccrs 已经改好了

@deepin-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: Decodetalkers, zccrs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-ci-robot deepin-ci-robot merged commit a94a528 into linuxdeepin:master Dec 19, 2023
15 checks passed
@Decodetalkers Decodetalkers deleted the skipincludeannotations branch December 19, 2023 06:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants