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.

Sign up for GitHub

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

Jump to bottom

Pre Release (v4.0.0-beta.2): Refactor cmake option #86

Merged
merged 15 commits into from
Oct 10, 2023
Merged

Pre Release (v4.0.0-beta.2): Refactor cmake option #86

merged 15 commits into from
Oct 10, 2023

Conversation

sksat
Copy link
Member

@sksat sksat commented Sep 6, 2023 •
edited
Loading

概要

散らかっている CMake option を整理する

Issue

詳細

  • C2A_ prefix に揃える
  • 元々の挙動だったが今後は optional としていくオプションは default OFF となるようにする

影響範囲

BUILD-C2A_AS_SILS_FW など，外部（SILS-S2E, c2a-runtime の build.rs）から使っていたオプションの名前が変わるため，breaking

備考

  • マージ前にバージョンを上げる

@sksat sksat added enhancement New feature or request priority::high priorityg high tools S2E labels Sep 6, 2023
@sksat sksat self-assigned this Sep 6, 2023
@sksat
Copy link
Member Author

sksat commented Sep 6, 2023

たぶん workflows-c2a に対しても breaking なんだよな

@sksat
Copy link
Member Author

sksat commented Sep 7, 2023

rebase

@sksat sksat force-pushed the feature/refactor-cmake-option branch 2 times, most recently from b84c593 to 2cd061a Compare September 7, 2023 12:56
@sksat
Copy link
Member Author

sksat commented Sep 7, 2023

ユーザ定義になっていがちだが，USE_SCI_COM_* 系もどうにかしたい．このタイミングで標準化すべきか......

@sksat
Copy link
Member Author

sksat commented Sep 7, 2023

おそらく USE_SCI_COM_WINGS, USE_SCI_COM_UART では済まないので，PR は分ける

@sksat sksat mentioned this pull request Sep 7, 2023
Merged
@sksat
Copy link
Member Author

sksat commented Sep 7, 2023

workflows-c2a v4.2.0 で C2A_BUILD_AS_CXX をサポートしたので，#72 を更新してマージ・rebase すればビルドは通るはず

@sksat
Copy link
Member Author

sksat commented Sep 7, 2023

#72 をマージしたので rebase

@sksat sksat force-pushed the feature/refactor-cmake-option branch from 3c32722 to addcd71 Compare September 7, 2023 14:53
@sksat
Copy link
Member Author

sksat commented Sep 7, 2023

S2E の更新必要だな

@meltingrabbit meltingrabbit mentioned this pull request Sep 8, 2023
Closed
meltingrabbit
meltingrabbit reviewed Sep 8, 2023
View reviewed changes
CMakeLists.txt Outdated Show resolved Hide resolved
@meltingrabbit meltingrabbit changed the title Refactor cmake option Pre Release (v4.0.0-beta.2): Refactor cmake option Sep 19, 2023
@sksat sksat changed the title Pre Release (v4.0.0-beta.2): Refactor cmake option Pre Release (v4.0.0-beta.3): Refactor cmake option Oct 5, 2023
@sksat
Copy link
Member Author

sksat commented Oct 5, 2023

rebase

@sksat sksat closed this Oct 5, 2023
@sksat sksat force-pushed the feature/refactor-cmake-option branch from 3357481 to 964c8f4 Compare October 5, 2023 17:35
@sksat
Copy link
Member Author

sksat commented Oct 5, 2023

オペミスしたので丁寧に復旧

@sksat sksat reopened this Oct 5, 2023
@sksat
Copy link
Member Author

sksat commented Oct 5, 2023

実は影響があるのは s2e-user-for-c2a-core だった．関連: #119

@sksat
Copy link
Member Author

sksat commented Oct 5, 2023

ビルド通ったな

@sksat sksat changed the title Pre Release (v4.0.0-beta.3): Refactor cmake option Pre Release (v4.0.0-beta.2): Refactor cmake option Oct 10, 2023
@sksat sksat force-pushed the feature/refactor-cmake-option branch from 921daa3 to deae4ef Compare October 10, 2023 15:33
@meltingrabbit
Copy link
Member

OKそう．

バージョン上げと，s2e user側のリリースが確認され次第，approveします

meltingrabbit
meltingrabbit requested changes Oct 10, 2023
View reviewed changes
Copy link
Member

@meltingrabbit meltingrabbit left a comment

Choose a reason for hiding this comment

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

s2e userのtag名修正

@sksat sksat force-pushed the feature/refactor-cmake-option branch from b3013c7 to 6a32752 Compare October 10, 2023 15:42
@sksat
Copy link
Member Author

sksat commented Oct 10, 2023

修正 & rebase

@meltingrabbit
Copy link
Member

https://github.com/ut-issl/s2e-user-for-c2a-core/releases/tag/ae-v3.0.0 で s2e 側のリリース

@sksat sksat merged commit 46a8495 into develop Oct 10, 2023
34 checks passed
@sksat sksat deleted the feature/refactor-cmake-option branch October 10, 2023 15:55
@sksat sksat linked an issue Oct 12, 2023 that may be closed by this pull request
CMake option を整理したい #83
Closed
3 tasks
This was referenced Oct 12, 2023
Merged
Closed
@meltingrabbit meltingrabbit mentioned this pull request Nov 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@meltingrabbit meltingrabbit meltingrabbit approved these changes

Assignees

@sksat sksat

Labels
enhancement New feature or request priority::high priorityg high S2E tools
Projects
C2A public
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CMake option を整理したい
2 participants
@sksat @meltingrabbit