[meson] use basename in check scripts now that meson passes dir also

This commit is contained in:
Ebrahim Byagowi 2020-07-04 03:13:32 +04:30
parent 785a9a8f8a
commit 404ecc252c
5 changed files with 9 additions and 9 deletions

View File

@ -4,9 +4,9 @@ import sys, os
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 \
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')]
HBSOURCES = os.environ.get ('HBSOURCES', '').split () or \
HBSOURCES = [os.path.basename (x) for x in os.environ.get ('HBSOURCES', '').split ()] or \
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))]
stat = 0

View File

@ -4,7 +4,7 @@ import sys, os, re
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 \
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')]
stat = 0

View File

@ -4,9 +4,9 @@ import sys, os, re
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 \
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')]
HBSOURCES = os.environ.get ('HBSOURCES', '').split () or \
HBSOURCES = [os.path.basename (x) for x in os.environ.get ('HBSOURCES', '').split ()] or \
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))]
stat = 0

View File

@ -4,9 +4,9 @@ import sys, os, re
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 \
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')]
HBSOURCES = os.environ.get ('HBSOURCES', '').split () or \
HBSOURCES = [os.path.basename (x) for x in os.environ.get ('HBSOURCES', '').split ()] or \
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))]
stat = 0

View File

@ -676,12 +676,12 @@ if get_option('tests').enabled()
env.set('libs', meson.current_build_dir()) # TODO: Merge this with builddir after autotools removal
HBSOURCES = []
foreach f : hb_sources
HBSOURCES += '@0@'.format(f).split ('/')[1]
HBSOURCES += '@0@'.format(f)
endforeach
env.set('HBSOURCES', ' '.join(HBSOURCES))
HBHEADERS = []
foreach f : hb_headers
HBHEADERS += '@0@'.format(f).split ('/')[1]
HBHEADERS += '@0@'.format(f)
endforeach
env.set('HBHEADERS', ' '.join(HBHEADERS))