Can print and set paths with mesonconf.

pull/15/head
Jussi Pakkanen 11 years ago
parent ad6ba0cadf
commit 7bc5867178
  1. 27
      mesonconf.py
  2. 7
      optinterpreter.py

@ -87,6 +87,20 @@ class Conf:
self.coredata.use_pch = self.tobool(v) self.coredata.use_pch = self.tobool(v)
elif k == 'unity': elif k == 'unity':
self.coredata.unity = self.tobool(v) self.coredata.unity = self.tobool(v)
elif k == 'installprefix':
self.coredata.prefix = v
elif k == 'libdir':
self.coredata.libdir = v
elif k == 'bindir':
self.coredata.bindir = v
elif k == 'includedir':
self.coredata.includedir = v
elif k == 'datadir':
self.coredata.datadir = v
elif k == 'mandir':
self.coredata.mandir = v
elif k == 'localedir':
self.coredata.localedir = v
else: else:
if k not in self.coredata.user_options: if k not in self.coredata.user_options:
raise ConfException('Unknown option %s.' % k) raise ConfException('Unknown option %s.' % k)
@ -113,11 +127,22 @@ class Conf:
carr = [] carr = []
carr.append(['type', 'Build type', self.coredata.buildtype]) carr.append(['type', 'Build type', self.coredata.buildtype])
carr.append(['strip', 'Strip on install', self.coredata.strip]) carr.append(['strip', 'Strip on install', self.coredata.strip])
carr.append(['coverage', 'Coverage', self.coredata.coverage]) carr.append(['coverage', 'Coverage report', self.coredata.coverage])
carr.append(['pch', 'Precompiled headers', self.coredata.use_pch]) carr.append(['pch', 'Precompiled headers', self.coredata.use_pch])
carr.append(['unity', 'Unity build', self.coredata.unity]) carr.append(['unity', 'Unity build', self.coredata.unity])
self.print_aligned(carr) self.print_aligned(carr)
print('') print('')
print('Directories\n')
parr = []
parr.append(['installprefix', 'Install prefix', self.coredata.prefix])
parr.append(['libdir', 'Library directory', self.coredata.libdir])
parr.append(['bindir', 'Binary directory', self.coredata.bindir])
parr.append(['includedir', 'Header directory', self.coredata.includedir])
parr.append(['datadir', 'Data directory', self.coredata.datadir])
parr.append(['mandir', 'Man page directory', self.coredata.mandir])
parr.append(['localedir', 'Locale file directory', self.coredata.localedir])
self.print_aligned(parr)
print('')
print('Project options\n') print('Project options\n')
options = self.coredata.user_options options = self.coredata.user_options
keys = list(options.keys()) keys = list(options.keys())

@ -22,6 +22,13 @@ forbidden_option_names = {'type': True,
'coverage': True, 'coverage': True,
'pch': True, 'pch': True,
'unity': True, 'unity': True,
'installprefix': True,
'libdir' : True,
'bindir' : True,
'includedir' : True,
'datadir' : True,
'mandir' : True,
'localedir' : True,
} }
class OptionException(coredata.MesonException): class OptionException(coredata.MesonException):

Loading…
Cancel
Save