Show information about flex (version and command path) in meson output

michaelpq · michaelpq · commit 72df1d3f1b9d · 2023-07-04T07:25:34.000+09:00
Like bison, this is useful to know which version and command of flex are detected by meson. For example, this was useful for me when using win_flex.exe on Windows. Reviewed-by: Peter Eisentraut Discussion: https://postgr.es/m/ZDT3FbmrjBuBthmR@paquier.xyz
diff --git a/meson.build b/meson.build
@@ -361,6 +361,10 @@ bison_kw = {
 }
 
 flex_flags = []
+if flex.found()
+  flex_version_c = run_command(flex, '--version', check: true)
+  flex_version = flex_version_c.stdout().split(' ')[1].split('\n')[0]
+endif
 flex_wrapper = files('src/tools/pgflex')
 flex_cmd = [python, flex_wrapper,
   '--builddir', '@BUILD_ROOT@',
@@ -3370,6 +3374,7 @@ if meson.version().version_compare('>=0.57')
     {
       'bison': '@0@ @1@'.format(bison.full_path(), bison_version),
       'dtrace': dtrace,
+      'flex': '@0@ @1@'.format(flex.full_path(), flex_version),
     },
     section: 'Programs',
   )

Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,10 @@ bison_kw = {`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`flex_flags = []`
	`364`	`+if flex.found()`
	`365`	`+ flex_version_c = run_command(flex, '--version', check: true)`
	`366`	`+ flex_version = flex_version_c.stdout().split(' ')[1].split('\n')[0]`
	`367`	`+endif`
`364`	`368`	`flex_wrapper = files('src/tools/pgflex')`
`365`	`369`	`flex_cmd = [python, flex_wrapper,`
`366`	`370`	`'--builddir', '@BUILD_ROOT@',`
`@@ -3370,6 +3374,7 @@ if meson.version().version_compare('>=0.57')`
`3370`	`3374`	`{`
`3371`	`3375`	`'bison': '@0@ @1@'.format(bison.full_path(), bison_version),`
`3372`	`3376`	`'dtrace': dtrace,`
	`3377`	`+ 'flex': '@0@ @1@'.format(flex.full_path(), flex_version),`
`3373`	`3378`	`},`
`3374`	`3379`	`section: 'Programs',`
`3375`	`3380`	`)`