Date: Fri, 17 Jul 2020 15:16:07 +0200 From: Gert Doering Message-ID: <20200717131607.GS1431@...1296...> References: <20200716225338.611-3-davids@...515...> <202007170802.06H82n5d006538@...2054...> <44e29beb-a441-97c0-bf66-1e2071e1296f@...2080...> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9GfWWSPtIGRmF8eS" Content-Disposition: inline In-Reply-To: <44e29beb-a441-97c0-bf66-1e2071e1296f@...2080...> Subject: Re: [Openvpn-devel] [PATCH applied] Re: doc/man: Replace old man page with generated man page List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Sommerseth Cc: Gert Doering , openvpn-devel@lists.sourceforge.net --9GfWWSPtIGRmF8eS Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, On Fri, Jul 17, 2020 at 12:04:30PM +0200, David Sommerseth wrote: > On 17/07/2020 10:02, Gert Doering wrote: > > Acked-by: Gert Doering > >=20 > > I have not tested the actual docutils / openvpn.8 generation (Samuli wi= ll=20 > > complain loudly if tarball making doesn't work anymore, so that *will*= =20 > > see testing). Generally it looks sane. > >=20 > > This condition looks a bit fishy, though... > >=20 > > +AM_CONDITIONAL([HAVE_PYDOCUTILS], [test "${RST2MAN}" -a "${RST2HTML}"= ]) > >=20 > > not sure what that will do in a POSIX shell. >=20 > Hmm ... whoops. That should probably have been >=20 > test -n "${RST2MAN}" -a -n "${RST2HTML}" >=20 > Not sure how that passed during my own tests. I tested it on a various of > boxes, but I only have Linux distros easily available. OK, there is something else - the buildbots are now failing with Missing python-docutils - skipping man/html page generation Missing python-docutils - skipping man page generation cp: cannot stat './openvpn.8.html': No such file or directory Makefile:686: recipe for target 'distdir' failed "if it knows that it's not doing these, it shouldn't try to copy it somewhere" Can you have a look please, while fixing the "test" thing above? > > Maybe this shouldn't be conditional either > >=20 > > +if HAVE_PYDOCUTILS > > dist_noinst_DATA +=3D openvpn.8 > >=20 > > because it will lead to "tarballs randomly contain openvpn.8 or not,=20 > > depending on whether docutils are around" - "make dist" should behave > > consistently, and if there are no docutils, I think it should fail, not > > silently leave out files. >=20 > The intention is that the tarball contains prebuilt openvpn.8 and openvpn= .html > files, which is generated by "make {dist,distcheck}".=20=20 Yes. In full agreement. What I worry is that if you run a "make dist" on a host that has no=20 docutils, configure will notice this, and not add "openvpn.8" to=20 "dist_noinst_DATA" - so it won't be built, not included in the tarball, and the tarball is incomplete. > If these files exists, > they will not be rebuilt unless explicitly removed. So most users buildi= ng > from the source tarball should not notice any difference from prioer Open= VPN > releases. This is what the additional dist-hook rule in doc/Makefile.am = does; > this is run right before the copied source tree is put into a tarball. >=20 > The challenge is that it must be a conditional to actually pass ./configu= re - > even when built from source tarballs.=20=20 Not sure I understand this. If openvpn.8 is there, because it was tarball'= ed, why would this line above create a new dependency? gert --=20 "If was one thing all people took for granted, was conviction that if you=20 feed honest figures into a computer, honest figures come out. Never doubte= d=20 it myself till I met a computer with a sense of humor." Robert A. Heinlein, The Moon is a Harsh Mistre= ss Gert Doering - Munich, Germany gert@...1296... --9GfWWSPtIGRmF8eS Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGcBAEBAgAGBQJfEaSWAAoJEB2Cnv7KVigSB5QL/2biWllwERiMI0k47lT/chwC 4o0GV4dX9Y+/9F7kdd/zTdXFWCWDRIYpjlZvGK/6geLEKoukajbNib53HmXObwJ2 yjPG8RPZrez2mjGD9la3D1Rlc9pdzvPqy92MF6IW4UP4d9uH5EtFXh4u+UIAFfot Db3xVpHYpxYwGBzWALgLRBwC9P7XTQP/xhclyjFSZHVE4E3go4qFWmFnu2ESIqsE 3KGXeEOsCJ5IAldSHRqpwExl2fFgB1NxS4ts1ZfuCr/aDxMmQX4ZIuCt9X80s+sd Qm3UxvF0Ty6Me7RE520FMJ1qlsckh0Zy+iMrcHvO+cpu9Cn6Oztjr7gljrWeh2g2 TUX6TvNvvOe5AfkWyTuMQ4/hAQrMCq4NUx1SQhwzIdvOLKcheR1t5A+PEp0hr03Y f5SMWY4Ca+GQQ0CFgRVrE99L3P6ozAvNPl66Hp0B5xgWTTdNyRpMbIz7mWG8uG0T i++ULPXUPYQxSQAU6iTSm+zu2g9yRx8CcANJJySKAA== =IU1s -----END PGP SIGNATURE----- --9GfWWSPtIGRmF8eS--