Content-Type: multipart/alternative;
 boundary="------------0r0a67F3jl3pXNO0y22O0QeG"
Message-ID: <b39e7b94-2969-18d9-e399-846af9575595@dunslane.net>
Date: Fri, 1 Dec 2023 14:06:13 -0500
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Content-Language: en-US
From: Andrew Dunstan <andrew@dunslane.net>
To: Andres Freund <andres@anarazel.de>
Cc: pgsql-committers@lists.postgresql.org
References: <E1r5Fwj-006RcU-Sh@gemulon.postgresql.org>
 <746ba786-85bb-d1f7-b613-57bec35c642a@dunslane.net>
 <20231129022843.6vfvgxjqpbgb62p5@awork3.anarazel.de>
 <703110e4-b495-e409-26a5-28e9fca8f3a5@dunslane.net>
 <ae3b453e-a6be-3b9f-a8fe-a885d5d2795c@dunslane.net>
Subject: Re: pgsql: meson: docs: Add {html,man} targets, rename install-doc-*
In-Reply-To: <ae3b453e-a6be-3b9f-a8fe-a885d5d2795c@dunslane.net>
Archived-At: 
 <https://www.postgresql.org/message-id/b39e7b94-2969-18d9-e399-846af9575595%40dunslane.net>
Precedence: bulk

This is a multi-part message in MIME format.
--------------0r0a67F3jl3pXNO0y22O0QeG
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit


On 2023-12-01 Fr 09:04, Andrew Dunstan wrote:
>
> On 2023-11-29 We 07:20, Andrew Dunstan wrote:
>>
>> On 2023-11-28 Tu 21:28, Andres Freund wrote:
>>> Hi,
>>>
>>> On 2023-11-23 08:32:21 -0500, Andrew Dunstan wrote:
>>>> On 2023-11-20 Mo 20:53, Andres Freund wrote:
>>>>> meson: docs: Add {html,man} targets, rename install-doc-*
>>>>>
>>>>> We have toplevel html, man targets in the autoconf build as well. 
>>>>> It'd be odd
>>>>> to have an 'html' target but have the install target be 
>>>>> 'install-doc-html',
>>>>> thus rename the install targets to match.
>>>>
>>>> This commit of one of its nearby friends appears to have broken 
>>>> crake's docs
>>>> build:
>>>>
>>>> ERROR: Can't invoke target `html`: ambiguous name.Add target type 
>>>> and/or path:
>>>> - ./doc/src/sgml/html:custom
>>>> - ./doc/src/sgml/html:alias
>>>>
>>>> See<https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=crake&dt=2023-11-23%2012%3A52%3A04> 
>>>>
>>> Ah, I realize now that this is from meson compile html, not 'ninja 
>>> html'. That
>>> explains why I couldn't reproduce this initially and why CI didn't 
>>> complain.
>>> I don't really understand why meson compile complains in this case.  
>>> I assume
>>> you don't want to disambiguate as suggested, by building html:alias 
>>> instead?
>>>
>>
>> I've done that as a temporary fix to get crake out of the hole, but 
>> it's pretty ugly, and I don't want to do it in a release if at all 
>> possible.
>
>
> and doing this has broken the docs build for release 16.


OK, so this code is what I have now, and seems to work on both HEAD and 
REL_16_STABLE:

         my $extra_targets = $PGBuild::conf{extra_doc_targets} || "";
         my @targs = split(/\s+/, $extra_targets);
         s!^!doc/src/sgml/! foreach @targs;
         $extra_targets=join(' ', @targs) ;
         @makeout = run_log("cd $pgsql && ninja doc/src/sgml/html $extra_targets");


cheers


andrew

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

--------------0r0a67F3jl3pXNO0y22O0QeG
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit

<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body>
    <p><br>
    </p>
    <div class="moz-cite-prefix">On 2023-12-01 Fr 09:04, Andrew Dunstan
      wrote:<br>
    </div>
    <blockquote type="cite"
      cite="mid:ae3b453e-a6be-3b9f-a8fe-a885d5d2795c@dunslane.net">
      <br>
      On 2023-11-29 We 07:20, Andrew Dunstan wrote:
      <br>
      <blockquote type="cite">
        <br>
        On 2023-11-28 Tu 21:28, Andres Freund wrote:
        <br>
        <blockquote type="cite">Hi,
          <br>
          <br>
          On 2023-11-23 08:32:21 -0500, Andrew Dunstan wrote:
          <br>
          <blockquote type="cite">On 2023-11-20 Mo 20:53, Andres Freund
            wrote:
            <br>
            <blockquote type="cite">meson: docs: Add {html,man} targets,
              rename install-doc-*
              <br>
              <br>
              We have toplevel html, man targets in the autoconf build
              as well. It'd be odd
              <br>
              to have an 'html' target but have the install target be
              'install-doc-html',
              <br>
              thus rename the install targets to match.
              <br>
            </blockquote>
            <br>
            This commit of one of its nearby friends appears to have
            broken crake's docs
            <br>
            build:
            <br>
            <br>
            ERROR: Can't invoke target `html`: ambiguous name.Add target
            type and/or path:
            <br>
            - ./doc/src/sgml/html:custom
            <br>
            - ./doc/src/sgml/html:alias
            <br>
            <br>
See<a class="moz-txt-link-rfc2396E" href="https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=crake&amp;dt=2023-11-23%2012%3A52%3A04">&lt;https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=crake&amp;dt=2023-11-23%2012%3A52%3A04&gt;</a>
            <br>
          </blockquote>
          Ah, I realize now that this is from meson compile html, not
          'ninja html'. That
          <br>
          explains why I couldn't reproduce this initially and why CI
          didn't complain.
          <br>
          I don't really understand why meson compile complains in this
          case.  I assume
          <br>
          you don't want to disambiguate as suggested, by building
          html:alias instead?
          <br>
          <br>
        </blockquote>
        <br>
        I've done that as a temporary fix to get crake out of the hole,
        but it's pretty ugly, and I don't want to do it in a release if
        at all possible.
        <br>
      </blockquote>
      <br>
      <br>
      and doing this has broken the docs build for release 16.
      <br>
    </blockquote>
    <p><br>
    </p>
    <p>OK, so this code is what I have now, and seems to work on both
      HEAD and REL_16_STABLE:</p>
    <pre>        my $extra_targets = $PGBuild::conf{extra_doc_targets} || "";
        my @targs = split(/\s+/, $extra_targets);
        s!^!doc/src/sgml/! foreach @targs;
        $extra_targets=join(' ', @targs) ;
        @makeout = run_log("cd $pgsql &amp;&amp; ninja doc/src/sgml/html $extra_targets");
</pre>
    <p><br>
    </p>
    <p>cheers</p>
    <p><br>
    </p>
    <p>andrew<br>
    </p>
    <pre class="moz-signature" signature-switch-id="d0437855-2267-4610-80b3-83167ec45b0b" cols="72">--
Andrew Dunstan
EDB: <a class="moz-txt-link-freetext" href="https://www.enterprisedb.com">https://www.enterprisedb.com</a>
</pre>
  </body>
</html>

--------------0r0a67F3jl3pXNO0y22O0QeG--