Commit6a4815c

committed

meson: Narrow dependencies for 'install-quiet' target

Previously test dependencies, which are not actually installed, wereunnecessarily built.Apply this to all branches with meson support, as part of an effort to fixincorrect test dependencies that can lead to test failures.Discussion:https://postgr.es/m/CAGECzQSvM3iSDmjF+=Kof5an6jN8UbkP_4cKKT9w6GZavmb5yQ@mail.gmail.comDiscussion:https://postgr.es/m/bdba588f-69a9-4f3e-9b95-62d07210a32e@eisentraut.orgBackpatch: 16-, where meson support was added

1 parent1b8a953 commit6a4815cCopy full SHA for 6a4815c

File tree

-3

lines changed

-3

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3239,24 +3239,30 @@ if libintl.found() and meson.version().version_compare('>=0.60')`
`3239`	`3239`	`endif`
`3240`	`3240`
`3241`	`3241`
`3242`		`-all_built= [`
	`3242`	`+# all targets that 'meson install' needs`
	`3243`	`+installed_targets= [`
`3243`	`3244`	`backend_targets,`
`3244`	`3245`	`bin_targets,`
`3245`	`3246`	`libpq_st,`
`3246`	`3247`	`pl_targets,`
`3247`	`3248`	`contrib_targets,`
`3248`	`3249`	`nls_mo_targets,`
`3249`		`- testprep_targets,`
`3250`	`3250`	`ecpg_targets,`
`3251`	`3251`	`]`
`3252`	`3252`
	`3253`	`+# all targets that require building code`
	`3254`	`+all_built= [`
	`3255`	`+ installed_targets,`
	`3256`	`+ testprep_targets,`
	`3257`	`+]`
	`3258`	`+`
`3253`	`3259`	`# Meson's default install target is quite verbose. Provide one that is quiet.`
`3254`	`3260`	`install_quiet=custom_target('install-quiet',`
`3255`	`3261`	`output:'install-quiet',`
`3256`	`3262`	`build_always_stale:true,`
`3257`	`3263`	`build_by_default:false,`
`3258`	`3264`	`command: [meson_bin, meson_args,'install','--quiet','--no-rebuild'],`
`3259`		`-depends:all_built,`
	`3265`	`+depends:installed_targets,`
`3260`	`3266`	`)`
`3261`	`3267`
`3262`	`3268`	`# Target to install files used for tests, which aren't installed by default`

Comments

(0)