pg.ddx.io  pgsql-committers@postgresql.org mailing list archive  
help / color / mirror / Atom feed
pgsql: meson: add install-{quiet, world} targets
7+ messages / 3 participants
[nested] [flat]

Commits from this thread:
  2023-04-05 ef07d351a1  meson: add docs, docs_pdf options
  2023-03-24 5b140dc8f0  meson: Fix oversight in install-quiet
* pgsql: meson: add install-{quiet, world} targets
@ 2023-03-24 04:30  Andres Freund <andres@anarazel.de>
  0 siblings, 2 replies; 7+ messages in thread

From: Andres Freund @ 2023-03-24 04:30 UTC (permalink / raw)
  To: pgsql-committers@lists.postgresql.org

meson: add install-{quiet, world} targets

To define our own install target, we need dependencies on the i18n targets,
which we did not collect so far.

Discussion: https://postgr.es/m/3fc3bb9b-f7f8-d442-35c1-ec82280c564a@enterprisedb.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/e522049f23998e64fd0b88cd66de8e8f42100bf1

Modified Files
--------------
meson.build                                | 76 ++++++++++++++++++++++++------
src/backend/po/meson.build                 |  2 +-
src/bin/initdb/po/meson.build              |  2 +-
src/bin/pg_amcheck/po/meson.build          |  2 +-
src/bin/pg_archivecleanup/po/meson.build   |  2 +-
src/bin/pg_basebackup/po/meson.build       |  2 +-
src/bin/pg_checksums/po/meson.build        |  2 +-
src/bin/pg_config/po/meson.build           |  2 +-
src/bin/pg_controldata/po/meson.build      |  2 +-
src/bin/pg_ctl/po/meson.build              |  2 +-
src/bin/pg_dump/po/meson.build             |  2 +-
src/bin/pg_resetwal/po/meson.build         |  2 +-
src/bin/pg_rewind/po/meson.build           |  2 +-
src/bin/pg_test_fsync/po/meson.build       |  2 +-
src/bin/pg_test_timing/po/meson.build      |  2 +-
src/bin/pg_upgrade/po/meson.build          |  2 +-
src/bin/pg_verifybackup/po/meson.build     |  2 +-
src/bin/pg_waldump/po/meson.build          |  2 +-
src/bin/psql/po/meson.build                |  2 +-
src/bin/scripts/po/meson.build             |  2 +-
src/interfaces/ecpg/ecpglib/po/meson.build |  2 +-
src/interfaces/ecpg/preproc/po/meson.build |  2 +-
src/interfaces/libpq/po/meson.build        |  2 +-
src/interfaces/libpq/test/meson.build      |  4 +-
src/pl/plperl/po/meson.build               |  2 +-
src/pl/plpgsql/src/po/meson.build          |  2 +-
src/pl/plpython/po/meson.build             |  2 +-
src/pl/tcl/po/meson.build                  |  2 +-
28 files changed, 89 insertions(+), 43 deletions(-)



^ permalink  raw  reply  [nested|flat] 7+ messages in thread

* Re: pgsql: meson: add install-{quiet, world} targets
@ 2023-03-24 13:21  Andrew Dunstan <andrew@dunslane.net>
  parent: Andres Freund <andres@anarazel.de>
  1 sibling, 1 reply; 7+ messages in thread

From: Andrew Dunstan @ 2023-03-24 13:21 UTC (permalink / raw)
  To: Andres Freund <andres@anarazel.de>; pgsql-committers@lists.postgresql.org


On 2023-03-24 Fr 00:30, Andres Freund wrote:
> meson: add install-{quiet, world} targets
>
> To define our own install target, we need dependencies on the i18n targets,
> which we did not collect so far.
>
> Discussion:https://postgr.es/m/3fc3bb9b-f7f8-d442-35c1-ec82280c564a@enterprisedb.com
>

For some reason that's not clear to me, this appears to have upset 
drongo, which complains like this:


pgsql\\meson.build:2941:0: ERROR: Program 'install' not found or not executable



cheers

andrew

--
Andrew Dunstan
EDB:https://www.enterprisedb.com

^ permalink  raw  reply  [nested|flat] 7+ messages in thread

* Re: pgsql: meson: add install-{quiet, world} targets
@ 2023-03-24 16:44  Andres Freund <andres@anarazel.de>
  parent: Andrew Dunstan <andrew@dunslane.net>
  0 siblings, 0 replies; 7+ messages in thread

From: Andres Freund @ 2023-03-24 16:44 UTC (permalink / raw)
  To: Andrew Dunstan <andrew@dunslane.net>; +Cc: pgsql-committers@lists.postgresql.org

Hi,

On 2023-03-24 09:21:40 -0400, Andrew Dunstan wrote:
> On 2023-03-24 Fr 00:30, Andres Freund wrote:
> > meson: add install-{quiet, world} targets
> > 
> > To define our own install target, we need dependencies on the i18n targets,
> > which we did not collect so far.
> > 
> > Discussion:https://postgr.es/m/3fc3bb9b-f7f8-d442-35c1-ec82280c564a@enterprisedb.com
> > 
> 
> For some reason that's not clear to me, this appears to have upset drongo,
> which complains like this:
> 
> 
> pgsql\\meson.build:2941:0: ERROR: Program 'install' not found or not executable

Oh - that's a legit bug on my side. Oops. It's only an accident it worked on
other platforms. I forgot to add meson_bin to the command, which worked on
other platforms because that'll commonly be just python (with the path to
meson.py in the arguments), but on drongo it's meson.exe (leaving 'install' as
the command). Pushed a fix.

Greetings,

Andres Freund





^ permalink  raw  reply  [nested|flat] 7+ messages in thread

* Re: pgsql: meson: add install-{quiet, world} targets
@ 2023-03-25 17:51  Justin Pryzby <pryzby@telsasoft.com>
  parent: Andres Freund <andres@anarazel.de>
  1 sibling, 1 reply; 7+ messages in thread

From: Justin Pryzby @ 2023-03-25 17:51 UTC (permalink / raw)
  To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-committers@lists.postgresql.org

On Fri, Mar 24, 2023 at 04:30:52AM +0000, Andres Freund wrote:
> meson: add install-{quiet, world} targets

 if docs.length() == 0
   run_target('docs', command: [missing, 'xsltproc'])
 else
   alias_target('docs', docs)
+  alias_target('install-docs', installdocs)
 endif

This fails to handle installdocs.length() == 0





^ permalink  raw  reply  [nested|flat] 7+ messages in thread

* Re: pgsql: meson: add install-{quiet, world} targets
@ 2023-03-25 18:03  Andres Freund <andres@anarazel.de>
  parent: Justin Pryzby <pryzby@telsasoft.com>
  0 siblings, 1 reply; 7+ messages in thread

From: Andres Freund @ 2023-03-25 18:03 UTC (permalink / raw)
  To: Justin Pryzby <pryzby@telsasoft.com>; +Cc: pgsql-committers@lists.postgresql.org

Hi,

On 2023-03-25 12:51:32 -0500, Justin Pryzby wrote:
> On Fri, Mar 24, 2023 at 04:30:52AM +0000, Andres Freund wrote:
> > meson: add install-{quiet, world} targets
> 
>  if docs.length() == 0
>    run_target('docs', command: [missing, 'xsltproc'])
>  else
>    alias_target('docs', docs)
> +  alias_target('install-docs', installdocs)
>  endif
> 
> This fails to handle installdocs.length() == 0

You mean in the sense of causing a failure in meson, or not providing the
install-docs target? For the latter: Yea. I wasn't sure what the behaviour
we'd want there. Should install-docs succeed if we don't have any of the
tools?  There's also an subdir_done() earlier on that we should probably
remove...

Greetings,

Andres Freund





^ permalink  raw  reply  [nested|flat] 7+ messages in thread

* Re: pgsql: meson: add install-{quiet, world} targets
@ 2023-03-25 18:05  Justin Pryzby <pryzby@telsasoft.com>
  parent: Andres Freund <andres@anarazel.de>
  0 siblings, 1 reply; 7+ messages in thread

From: Justin Pryzby @ 2023-03-25 18:05 UTC (permalink / raw)
  To: Andres Freund <andres@anarazel.de>; +Cc: pgsql-committers@lists.postgresql.org

On Sat, Mar 25, 2023 at 11:03:10AM -0700, Andres Freund wrote:
> Hi,
> 
> On 2023-03-25 12:51:32 -0500, Justin Pryzby wrote:
> > On Fri, Mar 24, 2023 at 04:30:52AM +0000, Andres Freund wrote:
> > > meson: add install-{quiet, world} targets
> > 
> >  if docs.length() == 0
> >    run_target('docs', command: [missing, 'xsltproc'])
> >  else
> >    alias_target('docs', docs)
> > +  alias_target('install-docs', installdocs)
> >  endif
> > 
> > This fails to handle installdocs.length() == 0
> 
> You mean in the sense of causing a failure in meson, or not providing the
> install-docs target? For the latter: Yea. I wasn't sure what the behaviour

The former, I guess.  I was going to look into the windows python header
warnings, but the configure step failed like:

[17:27:16.781] doc\src\sgml\meson.build:327:2: ERROR: alias_target takes at least 2 arguments, but got 1.





^ permalink  raw  reply  [nested|flat] 7+ messages in thread

* Re: pgsql: meson: add install-{quiet, world} targets
@ 2023-03-25 18:20  Andres Freund <andres@anarazel.de>
  parent: Justin Pryzby <pryzby@telsasoft.com>
  0 siblings, 0 replies; 7+ messages in thread

From: Andres Freund @ 2023-03-25 18:20 UTC (permalink / raw)
  To: Justin Pryzby <pryzby@telsasoft.com>; +Cc: pgsql-committers@lists.postgresql.org

Hi,

On 2023-03-25 13:05:19 -0500, Justin Pryzby wrote:
> On Sat, Mar 25, 2023 at 11:03:10AM -0700, Andres Freund wrote:
> > Hi,
> > 
> > On 2023-03-25 12:51:32 -0500, Justin Pryzby wrote:
> > > On Fri, Mar 24, 2023 at 04:30:52AM +0000, Andres Freund wrote:
> > > > meson: add install-{quiet, world} targets
> > > 
> > >  if docs.length() == 0
> > >    run_target('docs', command: [missing, 'xsltproc'])
> > >  else
> > >    alias_target('docs', docs)
> > > +  alias_target('install-docs', installdocs)
> > >  endif
> > > 
> > > This fails to handle installdocs.length() == 0
> > 
> > You mean in the sense of causing a failure in meson, or not providing the
> > install-docs target? For the latter: Yea. I wasn't sure what the behaviour
> 
> The former, I guess.  I was going to look into the windows python header
> warnings, but the configure step failed like:
> 
> [17:27:16.781] doc\src\sgml\meson.build:327:2: ERROR: alias_target takes at least 2 arguments, but got 1.

Huh - I thought that wouldn't be possible, because docs would also be empty in
that case. But it's not, because I added postgres-full.xml to docs (probably
so you can see docs xml validity issues with just xmllint available). So
"your" error happens if just xmllint, but not xsltproc is available.

I think the easiest "fix" might be to just define install-docs to also include
docs - that way install-docs at least checks the validity of xml, even if we
can't build any docs.

Greetings,

Andres Freund





^ permalink  raw  reply  [nested|flat] 7+ messages in thread


end of thread, other threads:[~2023-03-25 18:20 UTC | newest]

Thread overview: 7+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2023-03-24 04:30 pgsql: meson: add install-{quiet, world} targets Andres Freund <andres@anarazel.de>
2023-03-24 13:21 ` Andrew Dunstan <andrew@dunslane.net>
2023-03-24 16:44   ` Andres Freund <andres@anarazel.de>
2023-03-25 17:51 ` Justin Pryzby <pryzby@telsasoft.com>
2023-03-25 18:03   ` Andres Freund <andres@anarazel.de>
2023-03-25 18:05     ` Justin Pryzby <pryzby@telsasoft.com>
2023-03-25 18:20       ` Andres Freund <andres@anarazel.de>

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox