enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

WIP: Solve meson warnings and deprecations #47

Draft
dimmus wants to merge 14 commits from dimmus/efl:devs/dimmus/meson into master
pull from: dimmus/efl:devs/dimmus/meson
merge into: enlightenment:master
Conversation 2 Commits 14 Files Changed 38 +252 -227
dimmus commented 2023-12-05 05:08:49 -08:00
Contributor
Copy Link

Tested on meson 0.61.2 (ubuntu 20.04), 1.2.1 (Ubuntu 23.10).
Needs to be tested on other platforms (OS X, Windows).
Need more tests on linux platform as well.

Bug reports, notices and advices are wellcome!

Tested on meson 0.61.2 (ubuntu 20.04), 1.2.1 (Ubuntu 23.10). Needs to be tested on other platforms (OS X, Windows). Need more tests on linux platform as well. Bug reports, notices and advices are wellcome!
dimmus added 5 commits 2023-12-05 05:08:54 -08:00
eschwartz commented 2023-12-05 05:57:27 -08:00
First-time contributor
Copy Link

A lot of this isn't really necessary. Meson will log an informational notice but not escalate to a deprecation warning for things that you don't have the ability to change yet due to meson_version minimums support levels.

A lot of this isn't really necessary. Meson will log an informational notice but not escalate to a deprecation warning for things that you don't have the ability to change yet due to meson_version minimums support levels.
eschwartz requested changes 2023-12-05 06:06:04 -08:00
cmakeconfig/meson.build
@ -39,21 +38,21 @@ foreach cmake_file : cmake_src
input: cmake_file+'Config.cmake.in',
output: cmake_file+'Config.cmake',
install_dir: join_paths(dir_lib, 'cmake', cmake_file),
copy: true,
configuration : conf
eschwartz commented 2023-12-05 05:59:53 -08:00
First-time contributor
Copy Link

In this case I would advise not using configure_file at all. It seems to have nothing to configure, so usong configuration: conf is "wrong" (newer meson actually wants you to use fs.copy()!!) but the purpose of either one is supposed to be for files that you need in the build directory. For installing files, just (rename them to avoid the useless .in and) use install_data() instead.

In this case I would advise not using configure_file at all. It seems to have nothing to configure, so usong configuration: conf is "wrong" (newer meson actually wants you to use fs.copy()!!) but the purpose of either one is supposed to be for files that you need in the build directory. For installing files, just (rename them to avoid the useless .in and) use install_data() instead.
dimmus commented 2023-12-05 09:59:02 -08:00
Author
Contributor
Copy Link

caught it

caught it
doc/meson.build
@ -109,12 +109,12 @@ foreach text_filter_property : text_filter_properties
font = text_filter_property[1]
size = text_filter_property[2]
name = text_filter_property[3]
filter_code = run_command('cat', join_paths(meson.source_root(), 'src', 'examples', 'evas', 'filters', 'filter_'+name+'.lua'))
filter_code = run_command('cat', join_paths(source_root, 'src', 'examples', 'evas', 'filters', 'filter_'+name+'.lua'), check: false)
eschwartz commented 2023-12-05 06:02:01 -08:00
First-time contributor
Copy Link

There's a useful if/else you can do here: on new enough meson versions, use import('fs').read('../src/examples/......') for portability reasons.

There's a useful if/else you can do here: on new enough meson versions, use `import('fs').read('../src/examples/......')` for portability reasons.
dimmus commented 2023-12-05 10:06:00 -08:00
Author
Contributor
Copy Link

A valuable remark, thanks

A valuable remark, thanks
dimmus commented 2023-12-06 04:52:01 -08:00
Author
Contributor
Copy Link

but we have to set projects meson_version to >=0.57 to realize this

but we have to set projects meson_version to >=0.57 to realize this
src/lib/eina/meson.build
@ -365,1 +364,4 @@
iconv = dependency('iconv', required: false)
if meson.version().version_compare('>=0.60')
iconv = dependency('iconv', method: 'auto')
else
iconv = dependency('iconv', required: false)
eschwartz commented 2023-12-05 06:05:56 -08:00
First-time contributor
Copy Link

If you're looking up iconv in both sides of the branch, what's the point? Just use dependency('', required: false) to get a null dependency.

If you're looking up iconv in both sides of the branch, what's the point? Just use `dependency('', required: false)` to get a null dependency.
dimmus commented 2023-12-05 06:43:13 -08:00
Author
Contributor
Copy Link

It is a try to fight with the warning:
* 0.60.0: {'dep 'iconv' custom lookup'}

It is a try to fight with the warning: ` * 0.60.0: {'dep 'iconv' custom lookup'}`
eschwartz commented 2023-12-05 07:47:03 -08:00
First-time contributor
Copy Link

The thing is that you are still hitting the bad codepath for older versions of meson...

The thing is that you are still hitting the bad codepath for older versions of meson...
dimmus commented 2023-12-05 09:14:49 -08:00
Author
Contributor
Copy Link

Would be very appreciated if you could provide a link to the example with the novel meson coding approach.

Would be very appreciated if you could provide a link to the example with the novel meson coding approach.
dimmus commented 2023-12-05 06:38:11 -08:00
Author
Contributor
Copy Link

Hi, Eli. Thanks a lot. Valuable as usual.

Hi, Eli. Thanks a lot. Valuable as usual.
dimmus added 1 commit 2023-12-06 06:16:36 -08:00
bd12bf23e7
meson: revert commented 'fork' header 
Noticed that with defined HAVE_FORK we have a lot of timeouts in tests. Commented 'fork' solves this. Tried #undef in efl_check.h as well. Experiments to be continued.
dimmus added 8 commits 2023-12-22 04:41:39 -08:00
cc3f44f0a8
meson: make consistent usage of host_os 
Small main meson.build refactoring.
d3a2d8dffe
meson: remove unused meson_modules 
Small refactoring as well.
3b80c24dca
meson: remove braces from if statements 
More consistency and less noise.
This pull request has changes conflicting with the target branch.
  • src/tests/elementary/meson.build
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b dimmus-devs/dimmus/meson master
git pull devs/dimmus/meson

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff dimmus-devs/dimmus/meson
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
eschwartz
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: enlightenment/efl#47
No description provided.
Delete Branch "dimmus/efl:devs/dimmus/meson"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?