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

Move generated protocol code to build directory #2300

Merged
merged 9 commits into from Mar 17, 2022
Merged

Conversation

wmww
Copy link
Contributor

@wmww wmww commented Jan 28, 2022

This removes generated Wayland protocol code from the project source, and instead always generates these files as part of the build process (as discussed on mattermost)

Copy link
Contributor

@RAOF RAOF left a comment

Choose a reason for hiding this comment

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

Broadly in favour, with only maybe-improvements as comments.

Not borsing yet, as I think we've decided in Mattermost that we need specific generator tests before landing this.

src/wayland/CMakeLists.txt Outdated Show resolved Hide resolved
src/wayland/protocol/CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Contributor

@AlanGriffiths AlanGriffiths left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Collaborator

@Saviq Saviq left a comment

Choose a reason for hiding this comment

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

If it blends, let it.

bors merge

bors bot added a commit that referenced this pull request Mar 17, 2022
2300: Move generated protocol code to build directory r=Saviq a=wmww

This removes generated Wayland protocol code from the project source, and instead always generates these files as part of the build process (as discussed on mattermost)

Co-authored-by: William Wold <wm@wmww.sh>
Co-authored-by: Alan Griffiths <alan@octopull.co.uk>
Co-authored-by: Michał Sawicz <michal.sawicz@canonical.com>
@bors
Copy link
Contributor

bors bot commented Mar 17, 2022

@wmww
Copy link
Contributor Author

wmww commented Mar 17, 2022

Couldn't this use mir_generate_protocol_wrapper

No, because

2022-03-17T12:16:49.4352841Z target_sources called with non-compilable target type

Might be an easy fix, I didn't play around with it long enough to find it.

@Saviq Saviq force-pushed the move-wrappers-to-build-dir branch from 7b052ad to f526a40 Compare March 17, 2022 12:38
@Saviq
Copy link
Collaborator

Saviq commented Mar 17, 2022

Once more, with feeling then.

bors merge

@wmww
Copy link
Contributor Author

wmww commented Mar 17, 2022

bors cancel

@wmww
Copy link
Contributor Author

wmww commented Mar 17, 2022

bors r-

@wmww
Copy link
Contributor Author

wmww commented Mar 17, 2022

There's a couple places GENERATED_FILES is used in CMake, but it's never set.

@wmww
Copy link
Contributor Author

wmww commented Mar 17, 2022

bors r=Saviq

bors bot added a commit that referenced this pull request Mar 17, 2022
2300: Move generated protocol code to build directory r=Saviq a=wmww

This removes generated Wayland protocol code from the project source, and instead always generates these files as part of the build process (as discussed on mattermost)

Co-authored-by: William Wold <wm@wmww.sh>
Co-authored-by: Alan Griffiths <alan@octopull.co.uk>
@AlanGriffiths
Copy link
Contributor

I think bors forgot what it was doing!

bors retry

@Saviq
Copy link
Collaborator

Saviq commented Mar 17, 2022

One moar time.

bors r-

@bors
Copy link
Contributor

bors bot commented Mar 17, 2022

Canceled.

@Saviq
Copy link
Collaborator

Saviq commented Mar 17, 2022

bors merge

@bors bors bot merged commit 637984b into main Mar 17, 2022
@bors bors bot deleted the move-wrappers-to-build-dir branch March 17, 2022 16:53
@Saviq Saviq mentioned this pull request May 12, 2022
bors bot added a commit that referenced this pull request May 24, 2022
2423: Release 2.8.0 r=AlanGriffiths,graysonguarino,RAOF,wmww,Saviq a=Saviq

---
> - ABI summary:
>   - miral ABI unchanged at 4
>   - mircommon ABI bumped to 9
>   - mircookie ABI unchanged at 2
>   - mircore ABI unchanged at 1
>   - miroil ABI unchanged at 1
>   - mirplatform ABI unchanged at 23
>   - mirserver ABI bumped to 58
>   - mirwayland ABI unchanged at 3
>   - mirplatformgraphics ABI bumped to 20
>   - mirinputplatform ABI unchanged at 8
> - Enhancements:
>   - Move generated protocol code to build directory (#2300)
>   - Allow --app-env-amend to be supplied multiple times (#2333)
>   - Make window title a configuration option (#2349)
>   - Add fatal_error if unable to bind Wayland socket (#2350)
>   - Add `mold` to the list of supported linkers (#2353)
>   - Platform refactoring towards hybrid GPU support (#2358, #2378, #2407)
>   - Implement wlr_screencopy_unstable_v1 for screenshots (#2383)
>   - Refactor out mf::MirDisplay (#2406)
> - Bugs fixed:
>   - Synchronize buffer swaps to video frame in egl spinner (Fixes #2154)
>   - Do not give menus keyboard focus (Fixes #2324)
>   - Refactor Wayland keyboard input (Fixes #2331)
>   - Further simplify and correct keyboard focus setting (Fixes #2338)
>   - wl_pointer: do not send events when not compatible (Fixes #2341)
>   - Kill clients with error instead of sending unsupported (Fixes #2343)
>   - Initialize sig_handler_desc.sa_mask (#2386)
>   - Fix ThreadedDispatcherSignalTest.keeps_dispatching... (Fixes #2377)

Co-authored-by: Michał Sawicz <michal@sawicz.net>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants