Skip to content

Add Eo classes workarround for disabiling ector#482

Open
Coquinho wants to merge 13 commits into
devs/jptiz/optional-ectorfrom
devs/coquinho/optional-ector/vg-agnostic-eo-class
Open

Add Eo classes workarround for disabiling ector#482
Coquinho wants to merge 13 commits into
devs/jptiz/optional-ectorfrom
devs/coquinho/optional-ector/vg-agnostic-eo-class

Conversation

@Coquinho

Copy link
Copy Markdown
Contributor

This PR define vector-graphics and non vector-grafics eo classes "templates" for:

  • src/lib/efl/interfaces/efl_text_style.eo
  • src/lib/evas/canvas/efl_canvas_group.eo
  • src/lib/evas/canvas/efl_canvas_image_internal.eo
  • src/lib/evas/canvas/efl_canvas_textblock.eo

@Coquinho Coquinho requested a review from JPTIZ November 20, 2020 12:03
Comment thread src/bindings/cxx/meson.build Outdated
Comment thread src/bindings/cxx/meson.build Outdated
Comment thread src/lib/efl/interfaces/meson.build Outdated
Comment thread src/lib/efl/interfaces/meson.build Outdated
Comment thread src/lib/efl/interfaces/meson.build
Comment thread src/lib/evas/canvas/meson.build Outdated
Comment on lines +2 to +4
['efl_canvas_group.eo', 'efl_canvas_group_vg.eo_template', 'efl_canvas_group_non_vg.eo_template'],
['efl_canvas_image_internal.eo', 'efl_canvas_image_internal_vg.eo_template', 'efl_canvas_image_internal_non_vg.eo_template'],
['efl_canvas_textblock.eo', 'efl_canvas_textblock_vg.eo_template', 'efl_canvas_textblock_non_vg.eo_template'],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Not too much, but...

Suggested change
['efl_canvas_group.eo', 'efl_canvas_group_vg.eo_template', 'efl_canvas_group_non_vg.eo_template'],
['efl_canvas_image_internal.eo', 'efl_canvas_image_internal_vg.eo_template', 'efl_canvas_image_internal_non_vg.eo_template'],
['efl_canvas_textblock.eo', 'efl_canvas_textblock_vg.eo_template', 'efl_canvas_textblock_non_vg.eo_template'],
['efl_canvas_group.eo',
'efl_canvas_group_vg.eo_template',
'efl_canvas_group_non_vg.eo_template'],
['efl_canvas_image_internal.eo',
'efl_canvas_image_internal_vg.eo_template',
'efl_canvas_image_internal_non_vg.eo_template'],
['efl_canvas_textblock.eo',
'efl_canvas_textblock_vg.eo_template',
'efl_canvas_textblock_non_vg.eo_template'],

We could also change it into a dict (for better semantics) or just store the prefix and add _vg and _non_vg + .eo and .eo_template inside the foreach loop.

@Coquinho Coquinho Nov 20, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've reworked this, what do you think about it

Comment thread src/lib/evas/canvas/meson.build Outdated
Comment thread src/lib/evas/canvas/meson.build Outdated
copy: true,
)

priv_eo_file_target += custom_target('eolian_gen_' + eo_file,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Where is this variable initialized?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

src/lib/eo/meson.build:28:priv_eo_file_target = []

and elementary rewrite it:
src/lib/elementary/meson.build:250:priv_eo_file_target = []

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hm, do we want to append? How does it work/how is it processed?

@Coquinho Coquinho Nov 20, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I actually don't know how/why this works/is processed, here I'm just mimicking this, as it was done before this patch. So, just maintaining the same semantics.

{
Eolian_State *eos = eolian_state_new();
fail_if(!eolian_state_directory_add(eos, EO_SRC_DIR));
fail_if(!eolian_state_directory_add(eos, EO_BUILD_DIR));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why do we need this? (And what does this test-case tests exactly?)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This kinda loads all the .eos at that directory, the next line compiles them all. As now there are some eos classes at the build dir, we need to include them as well to address all dependencies.

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.

2 participants