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

Add Meson build system #53

Closed
wants to merge 3 commits into from
Closed

Add Meson build system #53

wants to merge 3 commits into from

Conversation

loathingKernel
Copy link
Contributor

@loathingKernel loathingKernel commented Mar 3, 2024 •
edited
Loading

Add build system based on Meson. This is not currently working properly and I am opening this PR just for tracking and review purposes.

@loathingKernel loathingKernel force-pushed the meson branch 4 times, most recently from 7fb4bbf to 1456753 Compare March 8, 2024 12:25
@loathingKernel loathingKernel force-pushed the meson branch 3 times, most recently from 3059fa7 to e9fd834 Compare March 22, 2024 10:11
@loathingKernel
build: Add meson build system.
714f555 
Squashed commits due to rename:
* meson: Update reaper default_options (doesn't work)
* meson: Generate version information for `ULWGL_VERSIONS.json`
* meson: Use meson string interpolation
* meson: Add man pages to meson
* meson: Use configure_file instead of sed
* meson: Use ulwgl version for reaper too
* meson: Rename ulwgl to umu
@loathingKernel
meson: fix manpage install location
55fbcc2
@loathingKernel loathingKernel changed the base branch from main to flatpak April 9, 2024 12:47
@loathingKernel
meson: add flatpak build option
4567383 
* the `flatpak` option disables docs and uses the flatpak as the
command to run in the steam tool

* update both meson and make to inherit the command used in `umu-launcher`
steam tool from the system-wide entry point for system packages
@R1kaB3rN R1kaB3rN deleted the branch Open-Wine-Components:flatpak April 24, 2024 22:34
@R1kaB3rN R1kaB3rN closed this Apr 24, 2024
@R1kaB3rN
Copy link
Member

I just deleted the flatpak branch in repo because update-flatpak will supersede it. And once that's merged, I'll probably delete that one too.

Though feel free to keep reparenting the branch and reopen if you haven't given up on building with meson.

@loathingKernel
Copy link
Contributor Author

loathingKernel commented Apr 25, 2024 •
edited
Loading

I will rebase on main once update-flatpak has been merged and re-open an new PR. I don't know if this was closed automatically by GitHub once the target branch was gone, but rebasing and re-targeting branches doesn't require closing the PR normally.

The meson build system is blocked by the reaper install location. Meson is being very picky about where to install binaries for subprojects as it is not controlled by umu's meson build system. My workaround would be to include reaper as a subtree instead of a submodule, and adapt it to install in <prefix>/bin/ as umu-reaper instead of <prefix>/share/umu/reaper along with the necessary changes in umu.

The second point I want to bring up, is that <prefix>/lib/ would be a more fitting location for the system-wide installation according to FHS. Since update-flatpak branch doesn't copy files any more, the change would be much less disruptive now.

What do you think of either of these?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@loathingKernel @R1kaB3rN