svn commit: r51260 - in head: en_US.ISO8859-1/htdocs/doc share/pgpkeys

[Wolfram Schneider]

On 12 December 2017 at 15:19, Glen Barber <gjb at freebsd.org> wrote:
> On Tue, Dec 12, 2017 at 01:17:11PM +0100, Wolfram Schneider wrote:
>> On 6 December 2017 at 19:50, Glen Barber <gjb at freebsd.org> wrote:
>> > Author: gjb
>> > Date: Wed Dec  6 18:50:32 2017
>> > New Revision: 51260
>> > URL: https://svnweb.freebsd.org/changeset/doc/51260
>> >
>> > Log:
>> >   Fix generating pgpkeyring.txt when it does not exist, which seems
>> >   to have been broken following r51076 or r51077.
>>
>> What do you mean with 'Fix generating pgpkeyring.txt when it does not exist'?
>>
>> The file pgpkeyring.txt will be created while building the English
>> docs for the web site:
>>
>> $ make -C en_US.ISO8859-1/htdocs all
>>
>> and then you will have the file
>> doc/share/pgpkeys/pgpkeyring.txt
>>
>> Your commit breaks `make -j' (parallel build)
>>
>> $ make -j32 p-all
>>
>> ===> articles/bsdl-gpl (all)
>> keyring.xml:16385: parser error : CData section not finished
>>
>> -----BEGIN PGP PUBLIC KEY BLOCK-----
>> mQINBFJCuag
>> --- all_subdir_books/handbook ---
>> ===> books/handbook (all)
>> --- all_subdir_articles/contributing ---
>> ===> articles/contributing (all)
>> 1Ss13Y8Vf5UxzEvY8O8c4lT4XOVQLuDEZn7nUcmMBr+b0haGwTW1lrQv1DvPEo0
>>                                                             ^
>>
>> keyring.xml:16385: parser error : Premature end of data in tag
>> programlisting line 16087
>> 1Ss13Y8Vf5UxzEvY8O8c4lT4XOVQLuDEZn7nUcmMBr+b0haGwTW1lrQv1DvPEo0
>>                                                                ^
>>
>> keyring.xml:16385: parser error : Premature end of data in tag keyring line 2
>> 1Ss13Y8Vf5UxzEvY8O8c4lT4XOVQLuDEZn7nUcmMBr+b0haGwTW1lrQv1DvPEo0
>>                                                                ^
>>
>> unable to parse keyring.xml
>> *** [pgpkeyring] Error code 6
>>
>> make[2]: stopped in /tmp/doc-build.PU3aNQj/doc/share/pgpkeys
>> A failure has been detected in another branch of the parallel make
>>
>
> Prior to this change pgpkeyring.txt was never created, and as such
> failed to install.  I checked the timestamp of the file on the build
> machine in the cluster, and confirmed it was not being generated there
> as well, eliminating a local issue.
>
> install -C  -o gjb -g gjb -m 444 imagelib/callouts/21.png  /home/gjb/public_html/FreeBSD/data/doc/en_US.ISO8859-1/books/porters-handbook/imagelib/callouts
> /home/gjb/public_html/FreeBSD/data/doc/en_US.ISO8859-1/books/porters-handbook/handbook.html -> /home/gjb/public_html/FreeBSD/data/doc/en_US.ISO8859-1/books/porters-handbook/index.html
> /home/gjb/public_html/FreeBSD/data/doc/faq -> /home/gjb/public_html/FreeBSD/data/doc/en_US.ISO8859-1/books/faq
> /home/gjb/public_html/FreeBSD/data/doc/handbook -> /home/gjb/public_html/FreeBSD/data/doc/en_US.ISO8859-1/books/handbook
> /home/gjb/public_html/FreeBSD/data/doc/en -> /home/gjb/public_html/FreeBSD/data/doc/en_US.ISO8859-1
> cp -f /freebsd/doctemp/share/pgpkeys/pgpkeyring.txt /home/gjb/public_html/FreeBSD/data/doc/pgpkeyring.txt
> cp: /freebsd/doctemp/share/pgpkeys/pgpkeyring.txt: No such file or directory
> *** Error code 1
>
> Stop.
> make[1]: stopped in /freebsd/doctemp/en_US.ISO8859-1/htdocs/doc
> *** Error code 1

Did you run 'make all' before 'make install'?

You must run "all" before "install". Install does not build files, it
will install them only.
"install" assume that you run the "all" target before, it will not run
"all" automatically.

I did a quick test and I see that pgpkeyring.txt was generated prior
to your commit:

git clone -q https://github.com/freebsd/freebsd-doc doc
cd doc; git checkout 182028aed582df013ac090340325eff65a6f8e4e
ENGLISH_ONLY=YES time make -C en_US.ISO8859-1/htdocs all >& all.log

real    3m30.506s
user    3m4.873s
sys     0m27.697s

find . -name 'pgp*.txt'
./share/pgpkeys/pgpkeyring.txt

and
time make -C en_US.ISO8859-1/htdocs install >& install.log

will install pgpkeyring.txt in ~/public_html/data/doc/pgpkeyring.txt

-Wolfram

> I have an idea on how to resolve the parallel build issue you reported.
> It will take some time to verify the behavior is correct.
>
> Glen
>



-- 
Wolfram Schneider <wosch at FreeBSD.org> https://wolfram.schneider.org