Page MenuHomePhabricator

meson: redo evas building
ClosedPublic

Authored by bu5hm4n on Oct 28 2019, 1:31 PM.

Details

Summary

before recent times we had to support static and shared building based
on the options of the user, which forced us to complicate our build with
the evas_goal hack. the evas_goal hack more or less was the idea of
"faking" the evas build in the evas directory, finish all the .eo
generation there, then build the modules and make all the static files
ready. Then build everything in evas_goal.

Now, that we just build everything the same always, we can simply build
it in the evas way (removing the evas_goal hack FINALLY), as the same modules
are build statically and shared.
This also gives us the possibility to build the shared image loaders
*again* the the modules directory, which unbreaks peoples build scripts
who packaged loader files seperatly.

Diff Detail

Repository
rEFL core/efl
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
bu5hm4n created this revision.Oct 28 2019, 1:31 PM
bu5hm4n requested review of this revision.Oct 28 2019, 1:31 PM
zmike requested changes to this revision.Oct 29 2019, 9:30 AM

This seems like an improvement overall.

I imagine this will have issues on Windows, however: if I run ninja data/elementary/themes/default.edj in a clean build directory, it fails. This was a common build ordering issue on Windows which works in the current build and must also work (for all edj files compiled during the build) after this patch.

This revision now requires changes to proceed.Oct 29 2019, 9:30 AM

You could safe me a little bit of time and just tell me what the issue is ?

zmike added a comment.Oct 29 2019, 9:40 AM

dunno how this helps but sure:

FAILED: data/elementary/themes/default.edj 
/usr/bin/env EFL_RUN_IN_TREE=1 /home/zmike/src/efl-land2/build/src/bin/edje/edje_cc -beta -fastcomp -deps data/elementary/themes/default.edj.d -sd /home/zmike/src/efl-land2/data/elementary/themes/snd -id /home/zmike/src/efl-land2/data/elementary/themes/img -id /home/zmike/src/efl-land2/data/elementary/themes/fdo -fd /home/zmike/src/efl-land2/data/elementary/themes/fnt ../data/elementary/themes/default.edc data/elementary/themes/default.edj
edje_cc: Critical. Compiling script code not clean.
bu5hm4n requested review of this revision.Oct 29 2019, 9:42 AM

That is caused by the fact that embryo is not build as a dep of edje, this is a bug, yes. but 0 related to this commit. And does also not work on master. Will fix that seperatly.

zmike accepted this revision.Oct 29 2019, 9:50 AM

ah, I was thinking of src/tests/emotion/data/theme.edj.

seems good

This revision is now accepted and ready to land.Oct 29 2019, 9:50 AM
Closed by commit rEFL28f630ba4187: meson: redo evas building (authored by Marcel Hollerbach <mail@marcel-hollerbach.de>, committed by zmike). · Explain WhyOct 29 2019, 9:56 AM
This revision was automatically updated to reflect the committed changes.