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.

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

[meson] use the recommended way to store generated files #2532

Merged
merged 4 commits into from
Jul 4, 2020

Conversation

ebraminio
Copy link
Collaborator

@ebraminio ebraminio commented Jul 3, 2020

As described in mesonbuild/meson#7156 (comment)

Fixes #2530

@ebraminio ebraminio added the meson meson build system label Jul 3, 2020
src/meson.build Outdated Show resolved Hide resolved
@ebraminio ebraminio force-pushed the meson-artifacts branch 2 times, most recently from 50a4f40 to 3b51a42 Compare July 3, 2020 23:34
ebraminio added a commit to ebraminio/harfbuzz that referenced this pull request Jul 4, 2020
@ebraminio ebraminio changed the title [meson] use the recommended way to generate ragel headers [meson] use the recommended way to store generated files Jul 4, 2020
ebraminio added a commit to ebraminio/harfbuzz that referenced this pull request Jul 4, 2020
ebraminio added a commit to ebraminio/harfbuzz that referenced this pull request Jul 4, 2020
@@ -4,9 +4,9 @@

os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__)))

HBHEADERS = os.environ.get ('HBHEADERS', '').split () or \
HBHEADERS = [os.path.basename (x) for x in os.environ.get ('HBHEADERS', '').split ()] or \
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Why these are needed? File objects in meson (created using by files() in this patch) when turned to string are like src/hb-x.hh instead just the base name they used to, alternative approach would be top drop the above chdir yet I like to keep the script still runnable from command line that's why I am doing this for now.

foreach f : hb_sources
HBSOURCES += '@0@'.format(f)
endforeach
env.set('HBSOURCES', ' '.join(HBSOURCES))
Copy link
Collaborator Author

@ebraminio ebraminio Jul 4, 2020

Choose a reason for hiding this comment

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

The for each above is to generate string out of files objects array, somehow a hack, I wish I could just pick the basename like the way it was before the patch at least so I didn't need to change check scripts.

@ebraminio ebraminio merged commit 359dbc9 into harfbuzz:master Jul 4, 2020
@ebraminio ebraminio deleted the meson-artifacts branch July 4, 2020 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
meson meson build system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[meson] use a more proper way for source alternating tasks
1 participant