[meson] use basename in check scripts now that meson passes dir also
This commit is contained in:
parent
785a9a8f8a
commit
404ecc252c
|
@ -4,9 +4,9 @@ import sys, os
|
||||||
|
|
||||||
os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__)))
|
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')]
|
[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'))]
|
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))]
|
||||||
|
|
||||||
stat = 0
|
stat = 0
|
||||||
|
|
|
@ -4,7 +4,7 @@ import sys, os, re
|
||||||
|
|
||||||
os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__)))
|
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')]
|
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')]
|
||||||
|
|
||||||
stat = 0
|
stat = 0
|
||||||
|
|
|
@ -4,9 +4,9 @@ import sys, os, re
|
||||||
|
|
||||||
os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__)))
|
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')]
|
[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'))]
|
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))]
|
||||||
|
|
||||||
stat = 0
|
stat = 0
|
||||||
|
|
|
@ -4,9 +4,9 @@ import sys, os, re
|
||||||
|
|
||||||
os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__)))
|
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')]
|
[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'))]
|
[x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))]
|
||||||
|
|
||||||
stat = 0
|
stat = 0
|
||||||
|
|
|
@ -676,12 +676,12 @@ if get_option('tests').enabled()
|
||||||
env.set('libs', meson.current_build_dir()) # TODO: Merge this with builddir after autotools removal
|
env.set('libs', meson.current_build_dir()) # TODO: Merge this with builddir after autotools removal
|
||||||
HBSOURCES = []
|
HBSOURCES = []
|
||||||
foreach f : hb_sources
|
foreach f : hb_sources
|
||||||
HBSOURCES += '@0@'.format(f).split ('/')[1]
|
HBSOURCES += '@0@'.format(f)
|
||||||
endforeach
|
endforeach
|
||||||
env.set('HBSOURCES', ' '.join(HBSOURCES))
|
env.set('HBSOURCES', ' '.join(HBSOURCES))
|
||||||
HBHEADERS = []
|
HBHEADERS = []
|
||||||
foreach f : hb_headers
|
foreach f : hb_headers
|
||||||
HBHEADERS += '@0@'.format(f).split ('/')[1]
|
HBHEADERS += '@0@'.format(f)
|
||||||
endforeach
|
endforeach
|
||||||
env.set('HBHEADERS', ' '.join(HBHEADERS))
|
env.set('HBHEADERS', ' '.join(HBHEADERS))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue