add meson support #691

christianrauch · 2022-11-18T20:56:16Z

This adds a new rosdebian and rosrpm template for meson. Fixes #690.

The templates are copied from the cmake templates and the rules.em was adapted for meson.

Requires: #700

christianrauch · 2022-12-03T14:14:21Z

@wjwwood @nuclearsandwich Can you have a look at this?

christianrauch · 2023-01-03T17:18:12Z

@wjwwood @nuclearsandwich @cottsay Can you please have a look at this and let me know what is missing?

nuclearsandwich · 2023-04-28T16:54:21Z

@christianrauch thank you for patiently maintaining this branch pending review.

Unrelated to the quality of the proposed changes, one of the things that has been delaying my review is trying to process my thoughts on how we ought to be handling the introduction of new build types in bloom. Specifically, should we have new build types like this one for meson start out in some kind of "preview" state or give some other indication that they are relatively new and thus has different stability standards compared to the other bloom build types. I do want to stress that I'm considering a disclaimer like this around the potential for change not an expectation or assumption and around stability not quality.

What I want for the meson build type and those that follow it is to decouple the overall bloom stability requirements from the ones for individual build types in order to give build type contributors/maintainers increased latitude. I would like the bloom team to be able to review the integration with bloom and trust that the build type maintainers are the subject matter experts with their tools, then just "click merge" to allow iterating in subsequent releases.
Right now, the thing that would help me feel comfortable moving towards that method of working would be some kind of disclaimer around the newly introduced build type.

What are your thoughts about something along those lines?

christianrauch · 2023-04-29T12:01:28Z

It makes sense to document and/or inform users that some build types are experimental and may fail. bloom could maintain a list of experimental build types and simply show a warning "<build type> support is experimental. Please report errors to https://github.com/ros-infrastructure/bloom." when someone runs bloom to release a package.

However, I also expect users of bloom to know that meson is a new build type. ROS has always been using CMake for most of its packages and now regular python processes for python packages in ROS 2. I think that someone releasing a meson package will be aware of this novelty.

christianrauch · 2023-05-04T17:18:17Z

FYI, this PR was used to release libcamera as deb and rpm package into humble.

nuclearsandwich · 2023-05-05T22:50:09Z

FYI, this PR was used to release libcamera as deb and rpm package into humble.

I am significantly troubled that a custom branch of bloom was used to deploy to an official rosdistro without any indication. Especially because bloom reports that the released 0.11.2 version was used for ros/rosdistro#37104

I found that ros/rosdistro#36388 (comment) references this fact.
If in the future, you're using a non-standard version of bloom please call attention to it (although you do not need to cc me specifically in each case) on every review.

All the more reason to get this merged and released with an experimental tag.

christianrauch · 2023-05-06T08:48:54Z

I am significantly troubled that a custom branch of bloom was used to deploy to an official rosdistro without any indication. Especially because bloom reports that the released 0.11.2 version was used for ros/rosdistro#37104

Sorry that this comes as a surprise to you now. Since this PR is open for more than 5 months now without getting feedback after nagging people and also since my comment on the rosdep PR (ros/rosdistro#36388 (comment)) went unnoticed, I assumed that there are no issues with the process. I am really not sure what I could have done more to notify people about this.

nuclearsandwich

I've completed a review of the general and debian-specific changes. There aren't any serious blockers but there are a few open questions.

@cottsay would you be willing to review the RPM changes, in particular the spec file?

nuclearsandwich · 2023-05-26T23:40:03Z

bloom/generators/debian/templates/meson/rules.em

+	dh_auto_configure -- \
+		--prefix="@(InstallationPrefix)" \
+		--cmake-prefix-path="@(InstallationPrefix)" \
+		--libdir=lib \
+		--libexecdir=lib \
+		--strip


Does meson have an equivalent to CMake's BUILD_TESTING? #649 will exclude test dependencies conditionally based on the nocheck debian build option. The CMake-derived build types test for this as such to specifically disable BUILD_TESTING.

bloom/bloom/generators/debian/templates/cmake/rules.em

Lines 20 to 22 in d3d21ae

ifneq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)

BUILD_TESTING_ARG=-DBUILD_TESTING=OFF

endif

I don't see such a flag. You can directly add unit tests and run them with meson test (https://mesonbuild.com/Unit-tests.html) but I don't see an integrated flag that could handle test dependencies. I don't know the details but I would assume that the tests are only built when you actually run meson test.

Other than that, the test option is commonly used which is then checked with if get_option('test') inside the meson file. We could set that parameter here but it is not guaranteed that every meson project will use the same option for tests.

bloom/commands/generate.py

nuclearsandwich · 2023-05-26T23:46:28Z

bloom/generators/README.md

@@ -12,4 +12,4 @@ Bloom now supports different build types by inspecting the `build_type` tag in p
 Templates for a build type are stored in subdirectories of the platform's templates directory named for the build type.
 As an example the templates for the `ament_cmake` build type for debian packages is stored in [bloom/generators/debian/templates/ament_cmake](debian/templates/ament_cmake).

-To add support for a new build type create a new templates subdirectory for it in your target platform's `templates` directory, and add any necessary supporting code to the generator for build type specific substitutions.For examples search for "Build-type specific substitutions" in [bloom/generators/debian/generator.py](debian/generator.py).
+To add support for a new build type create a new templates subdirectory for it in your target platform's `templates` directory, and add any necessary supporting code to the generator for build type specific substitutions. For examples search for "Build-type specific substitutions" in [bloom/generators/debian/generator.py](debian/generator.py).


Thanks for this correction. Markdown and RST files in ros-infrastructure projects use "semantic line breaks" with one sentence per line.

So the preferred fix would be:

Suggested change

To add support for a new build type create a new templates subdirectory for it in your target platform's `templates` directory, and add any necessary supporting code to the generator for build type specific substitutions. For examples search for "Build-type specific substitutions" in [bloom/generators/debian/generator.py](debian/generator.py).

To add support for a new build type create a new templates subdirectory for it in your target platform's `templates` directory, and add any necessary supporting code to the generator for build type specific substitutions.

For examples search for "Build-type specific substitutions" in [bloom/generators/debian/generator.py](debian/generator.py).

However in #702 I've expanded and rephrased this section so if this PR merges first then I'll correct it there after resolving any potential conflicts so this does not block.

bloom/generators/debian/templates/meson/rules.em

bloom/generators/rosrpm.py

nuclearsandwich · 2023-05-27T00:01:12Z

I am really not sure what I could have done more to notify people about this.

I concur that you did everything in your power. It's presumptive of me to assume that you would wait indefinitely.

christianrauch · 2023-07-16T14:21:48Z

ping @nuclearsandwich

christianrauch

I addressed your open questions and added more information to the commit messages.

bloom/generators/debian/templates/meson/rules.em

bloom/generators/rosrpm.py

christianrauch · 2024-05-01T19:56:47Z

@nuclearsandwich @cottsay Can either of you have a look at this again, please?

The default 'installation_prefix' is '/usr'. This is wrong for 'rosrpm' and has to be prefixed correctly with the default ROS installation.

codecov-commenter · 2024-09-01T17:31:39Z

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

Please upload report for BASE (master@b42a1dd). Learn more about missing BASE report.

Files with missing lines	Patch %	Lines
bloom/generators/debian/generator.py	0.00%	2 Missing ⚠️
bloom/generators/rpm/generator.py	0.00%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##             master     #691   +/-   ##
=========================================
  Coverage          ?   54.59%           
=========================================
  Files             ?       52           
  Lines             ?     6367           
  Branches          ?     1276           
=========================================
  Hits              ?     3476           
  Misses            ?     2534           
  Partials          ?      357

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

This was referenced Nov 20, 2022

support meson #690

Open

add libcamera to humble and rolling ros/rosdistro#35029

Closed

christianrauch mentioned this pull request Mar 3, 2023

libcamera: 0.0.4-1 in 'humble/distribution.yaml' [bloom] ros/rosdistro#36388

Merged

christianrauch force-pushed the meson branch 2 times, most recently from b99113d to dd483c0 Compare April 2, 2023 13:10

christianrauch force-pushed the meson branch 4 times, most recently from d3231ca to 21ce2d7 Compare April 10, 2023 19:29

christianrauch force-pushed the meson branch from 21ce2d7 to 88cc816 Compare April 21, 2023 21:36

nuclearsandwich reviewed May 27, 2023

View reviewed changes

nuclearsandwich self-assigned this May 30, 2023

christianrauch force-pushed the meson branch from c398b13 to a2f28d2 Compare July 16, 2023 14:16

christianrauch force-pushed the meson branch from e144e15 to 667f2c5 Compare November 25, 2023 19:57

christianrauch commented Nov 25, 2023

View reviewed changes

bloom/generators/debian/templates/meson/rules.em Outdated Show resolved Hide resolved

bloom/generators/rosrpm.py Show resolved Hide resolved

christianrauch force-pushed the meson branch from 667f2c5 to 81c4dc6 Compare April 23, 2024 19:35

christianrauch requested a review from nuclearsandwich April 25, 2024 18:24

christianrauch force-pushed the meson branch from 81c4dc6 to 8605d8f Compare May 1, 2024 17:14

christianrauch added 2 commits May 9, 2024 19:57

fix missing whitespace

1bd76e9

fix ROS installation prefix for RPM generator

7551c2e

The default 'installation_prefix' is '/usr'. This is wrong for 'rosrpm' and has to be prefixed correctly with the default ROS installation.

add debian meson template

ada919c

christianrauch force-pushed the meson branch from 8605d8f to 6349ced Compare May 9, 2024 17:58

christianrauch force-pushed the meson branch from 6349ced to fa9842a Compare May 23, 2024 18:42

add rpm meson template

0ec60c6

christianrauch force-pushed the meson branch from 2e460e8 to 0ec60c6 Compare September 1, 2024 18:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add meson support #691

add meson support #691

christianrauch commented Nov 18, 2022 •

edited

Loading

christianrauch commented Dec 3, 2022

christianrauch commented Jan 3, 2023

nuclearsandwich commented Apr 28, 2023

christianrauch commented Apr 29, 2023

christianrauch commented May 4, 2023

nuclearsandwich commented May 5, 2023

christianrauch commented May 6, 2023

nuclearsandwich left a comment

nuclearsandwich May 26, 2023

christianrauch Apr 25, 2024

nuclearsandwich May 26, 2023

nuclearsandwich commented May 27, 2023

christianrauch commented Jul 16, 2023

christianrauch left a comment

christianrauch commented May 1, 2024

codecov-commenter commented Sep 1, 2024 •

edited

Loading

	ifneq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
	BUILD_TESTING_ARG=-DBUILD_TESTING=OFF
	endif

	To add support for a new build type create a new templates subdirectory for it in your target platform's `templates` directory, and add any necessary supporting code to the generator for build type specific substitutions. For examples search for "Build-type specific substitutions" in [bloom/generators/debian/generator.py](debian/generator.py).
	To add support for a new build type create a new templates subdirectory for it in your target platform's `templates` directory, and add any necessary supporting code to the generator for build type specific substitutions.
	For examples search for "Build-type specific substitutions" in [bloom/generators/debian/generator.py](debian/generator.py).

add meson support #691

Are you sure you want to change the base?

add meson support #691

Conversation

christianrauch commented Nov 18, 2022 • edited Loading

christianrauch commented Dec 3, 2022

christianrauch commented Jan 3, 2023

nuclearsandwich commented Apr 28, 2023

christianrauch commented Apr 29, 2023

christianrauch commented May 4, 2023

nuclearsandwich commented May 5, 2023

christianrauch commented May 6, 2023

nuclearsandwich left a comment

Choose a reason for hiding this comment

nuclearsandwich May 26, 2023

Choose a reason for hiding this comment

christianrauch Apr 25, 2024

Choose a reason for hiding this comment

nuclearsandwich May 26, 2023

Choose a reason for hiding this comment

nuclearsandwich commented May 27, 2023

christianrauch commented Jul 16, 2023

christianrauch left a comment

Choose a reason for hiding this comment

christianrauch commented May 1, 2024

codecov-commenter commented Sep 1, 2024 • edited Loading

Codecov Report

christianrauch commented Nov 18, 2022 •

edited

Loading

codecov-commenter commented Sep 1, 2024 •

edited

Loading