Date: Sat, 20 Oct 2001 02:00:02 -0700 (PDT) From: Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp> To: freebsd-doc@freebsd.org Subject: Re: docs/31350: make of doc module fails after 'make obj' Message-ID: <200110200900.f9K902N86205@freefall.freebsd.org>
index | next in thread | raw e-mail
The following reply was made to PR docs/31350; it has been noted by GNATS.
From: Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: clefevre@citeweb.net
Subject: Re: docs/31350: make of doc module fails after 'make obj'
Date: 20 Oct 2001 17:56:33 +0900
Cyrille wrote:
>Akio Morita wrote:
>> Cyrille wrote:
>>
>> >Akio Morita wrote:
>> >>
>> >> >Number: 31350
>> >> >Category: docs
>> >> >Synopsis: make of doc module fails after 'make obj'
>> >
>> >you are duplicating the job I'm doing. see PR #31131 for details.
>> >
>> (snip)
>> >
>> >does this patch set is `make package' compatible ?
>> >how about .tar archives ?
>> >
>> Last night, I tested package target.
>> In this test, I found erratas of package rule generation in doc.docbook.mk.
>> I made a following errata fix.
>> i. Correct typo (doc.docbook.mk)
>> ii. Correct docbook.css insertion to PLIST (doc.docbook.mk)
>> iii. Add ${CSS_SHEET} and images to PLIST (doc.html.mk)
>> (en_US.ISO8859-1/articles/console-server needs this)
>>
>> With following patch, package target of my patch set (PR:31350)
>> seems to work fine.
>
>sorry, but it doesn't.
>
>root@gits:vm-design/ (ttyp1) [22:38:02-11]# make package
>Creating package /usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/vm-design.en_US.ISO8859-1.txt.tgz
>Using SrcDir value of .
>Creating gzip'd tar ball in '/usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/vm-design.en_US.ISO8859-1.txt.tgz'
>tar: Can't change to directory /usr/share/doc/en_US.ISO8859-1/articles/vm-design : No such file or directory
>tar: can't add file article.txt : No such file or directory
>pkg_create: make_dist: tar command failed with code 256
>*** Error code 2
>
>Stop in /usr/tmp/doc/en_US.ISO8859-1/articles/vm-design.
>
I can't reproduce your failure.
FORMATS in en_US.ISO8859-1/articles/vm-design/Makefile is html.
Therefore package taget requests only package-html target.
Thus I try `make FORMATS=txt package' under my patch set
and get following results.
--- logs ---
% cd /usr/doc/en_US.ISO8859-1/articles/vm-design
% make FORMATS=txt
touch index.sgml
/usr/local/bin/jade -ioutput.html -V nochunks -c /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../en_US.ISO8859-1/share/sgml/catalog -c /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../share/sgml/catalog -c /usr/local/share/sgml/docbook/dsssl/modular/catalog -c /usr/local/share/sgml/docbook/catalog -c /usr/local/share/sgml/jade/catalog -d /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../share/sgml/default.dsl -t sgml /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/article.sgml > article.html-text || (rm -f article.html-text && false)
links -dump article.html-text > article.txt
gzip -9 -c article.txt > article.txt.gz
% su
# make FORMATS=txt install
install -C -o root -g wheel -m 444 article.txt.gz /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 article.txt /usr/share/doc/en_US.ISO8859-1/articles/vm-design
# make FORMATS=txt PACKAGES=/tmp package
Creating package /tmp/vm-design.en_US.ISO8859-1.txt.tgz
Using SrcDir value of .
Creating gzip'd tar ball in '/tmp/vm-design.en_US.ISO8859-1.txt.tgz'
# tar ztvf /tmp/vm-design.en_US.ISO8859-1.txt.tgz
-rw-r--r-- root/wheel 151 10/20 16:01 2001 +CONTENTS
-rw-r--r-- root/wheel 25 10/20 16:01 2001 +COMMENT
-rw-r--r-- root/wheel 25 10/20 16:01 2001 +DESC
-r--r--r-- root/wheel 42236 10/20 15:57 2001 article.txt
--- logs ---
>root@gits:vm-design/ (ttypa) [22:40:46-51]# make FORMATS=html\ html-split package
>echo docbook.css >> PLIST
>Creating package /usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/vm-design.en_US.ISO8859-1.html.tgz
>Using SrcDir value of .
>Creating gzip'd tar ball in '/usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/vm-design.en_US.ISO8859-1.html.tgz'
>tar: Can't change to directory /usr/share/doc/en_US.ISO8859-1/articles/vm-design : No such file or directory
>tar: can't add file article.html : No such file or directory
>tar: can't add file docbook.css : No such file or directory
>tar: can't add file fig1.png : No such file or directory
>tar: can't add file fig2.png : No such file or directory
>tar: can't add file fig3.png : No such file or directory
>tar: can't add file fig4.png : No such file or directory
>pkg_create: make_dist: tar command failed with code 256
>*** Error code 2
>
>Stop in /usr/tmp/doc/en_US.ISO8859-1/articles/vm-design.
>
I try html and html-split package build under my patch set
and get following results.
It seems that you forgot to run `make install'.
--- logs ---
% cd /usr/doc/en_US.ISO8859-1/articles/vm-design
% make FORMATS=html\ html-split
cp /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/fig1.eps fig1.eps
peps -r 100 -p -o fig1.png fig1.eps
cp /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/fig2.eps fig2.eps
peps -r 100 -p -o fig2.png fig2.eps
cp /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/fig3.eps fig3.eps
peps -r 100 -p -o fig3.png fig3.eps
sasami% make FORMATS=html\ html-split
cp /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/fig1.eps fig1.eps
peps -r 100 -p -o fig1.png fig1.eps
cp /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/fig2.eps fig2.eps
peps -r 100 -p -o fig2.png fig2.eps
cp /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/fig3.eps fig3.eps
peps -r 100 -p -o fig3.png fig3.eps
cp /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/fig4.eps fig4.eps
peps -r 100 -p -o fig4.png fig4.eps
touch index.sgml
cp /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../share/misc/docbook.css docbook.css
/usr/local/bin/jade -ioutput.html -ioutput.html.images -V nochunks -c /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../en_US.ISO8859-1/share/sgml/catalog -c /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../share/sgml/catalog -c /usr/local/share/sgml/docbook/dsssl/modular/catalog -c /usr/local/share/sgml/docbook/catalog -c /usr/local/share/sgml/jade/catalog -d /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../share/sgml/default.dsl -t sgml /usr/SRC/doc/en_US.ISO8859-1/articles/vm-d esign/article.sgml > article.html || (rm -f article.html && false)
tidy -i -m -f /dev/null article.html
*** Error code 1 (ignored)
/usr/local/bin/jade -D`dirname index.html` -V html-manifest -ioutput.html -ioutput.html.images -c /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../en_US.ISO8859-1/share/sgml/catalog -c /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../share/sgml/catalog -c /usr/local/share/sgml/docbook/dsssl/modular/catalog -c /usr/local/share/sgml/docbook/catalog -c /usr/local/share/sgml/jade/catalog -d /usr/SRC/doc/en_US.ISO8859-1/articles/vm-design/../../../share/sgml/default.dsl -t sgml /usr/SRC/doc/e n_US.ISO8859-1/articles/vm-design/article.sgml
tidy -i -m -f /dev/null `xargs < HTML.manifest`
*** Error code 1 (ignored)
% make FORMATS=html\ html-split install
install -C -o root -g wheel -m 444 article.html /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 docbook.css /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 fig1.png /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 fig2.png /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 fig3.png /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 fig4.png /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 `xargs < HTML.manifest` /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 docbook.css /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 fig1.png /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 fig2.png /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 fig3.png /usr/share/doc/en_US.ISO8859-1/articles/vm-design
install -C -o root -g wheel -m 444 fig4.png /usr/share/doc/en_US.ISO8859-1/articles/vm-design
% make FORMATS=html\ html-split PACKAGES=/tmp package
echo docbook.css >> PLIST
Creating package /tmp/vm-design.en_US.ISO8859-1.html.tgz
Using SrcDir value of .
Creating gzip'd tar ball in '/tmp/vm-design.en_US.ISO8859-1.html.tgz'
echo docbook.css >> PLIST
Creating package /tmp/vm-design.en_US.ISO8859-1.html-split.tgz
Using SrcDir value of .
Creating gzip'd tar ball in '/tmp/vm-design.en_US.ISO8859-1.html-split.tgz'
% tar ztvf /tmp/vm-design.en_US.ISO8859-1.html.tgz
-rw-r--r-- root/wheel 201 10/20 16:06 2001 +CONTENTS
-rw-r--r-- root/wheel 26 10/20 16:06 2001 +COMMENT
-rw-r--r-- root/wheel 26 10/20 16:06 2001 +DESC
-r--r--r-- root/wheel 54082 10/18 17:56 2001 article.html
-r--r--r-- root/wheel 2963 9/28 23:42 2001 docbook.css
-r--r--r-- root/wheel 549 9/28 23:42 2001 fig1.png
-r--r--r-- root/wheel 810 9/28 23:42 2001 fig2.png
-r--r--r-- root/wheel 1196 9/28 23:42 2001 fig3.png
-r--r--r-- root/wheel 1153 9/28 23:42 2001 fig4.png
% tar ztvf /tmp/vm-design.en_US.ISO8859-1.html-split.tgz
-rw-r--r-- root/wheel 291 10/20 16:06 2001 +CONTENTS
-rw-r--r-- root/wheel 32 10/20 16:06 2001 +COMMENT
-rw-r--r-- root/wheel 32 10/20 16:06 2001 +DESC
-r--r--r-- root/wheel 7733 10/20 16:06 2001 index.html
-r--r--r-- root/wheel 11449 10/20 16:06 2001 x26.html
-r--r--r-- root/wheel 5933 10/20 16:06 2001 x69.html
-r--r--r-- root/wheel 8288 10/20 16:06 2001 x75.html
-r--r--r-- root/wheel 5555 10/20 16:06 2001 x88.html
-r--r--r-- root/wheel 5057 10/20 16:06 2001 x103.html
-r--r--r-- root/wheel 4883 10/20 16:06 2001 x112.html
-r--r--r-- root/wheel 3421 10/20 16:06 2001 x116.html
-r--r--r-- root/wheel 21689 10/20 16:06 2001 x119.html
-r--r--r-- root/wheel 2603 10/20 16:06 2001 ln14.html
-r--r--r-- root/wheel 2963 9/28 23:42 2001 docbook.css
-r--r--r-- root/wheel 549 9/28 23:42 2001 fig1.png
-r--r--r-- root/wheel 810 9/28 23:42 2001 fig2.png
-r--r--r-- root/wheel 1196 9/28 23:42 2001 fig3.png
-r--r--r-- root/wheel 1153 9/28 23:42 2001 fig4.png
--- logs ---
>> Results of `make package' in doc directory.
>> o doc/packages exists
>> Whole packages (*.tgz archive) are stored into doc/packages directory.
>>
>> o otherwise
>> Each package is stored into its source directory.
>> Ex) package `committers-guide.en_US.ISO8859-1.html.tgz' is stored
>> into doc/en_US.ISO8859-1/articles/committers-guide directory.
>
>IMHO, they should go to /usr/obj/... if you consider that /usr/doc
>is read-only mounted.
>
In such case that /usr/doc is read-only mounted,
I think that either using a symbolic-link (/usr/doc/packages)
or setting PACKAGES is reasonable.
I think that the package storage action that you recommend
is incompatible to package target of ports.
In my understanding, ports framework stores packages into
either /usr/ports/packages or its source directory.
>> --- errata fix ---
(snip)
>> --- share/mk/doc.html.mk.OLD Fri Oct 19 14:28:58 2001
>> +++ share/mk/doc.html.mk Fri Oct 19 14:37:14 2001
>> @@ -304,6 +304,12 @@
>> _cf=${_curformat}
>> package-${_curformat}: install-${_curformat}
>> @echo ${DOC}.${_curformat} > PLIST
>> +.if defined(CSS_SHEET)
>> + @echo ${CSS_SHEET} >> PLIST
>
>this is wrong :
>
>root@gits:vm-design/ (ttypa) [22:45:25-57]# make -V CSS_SHEET
>/usr/tmp/doc/en_US.ISO8859-1/articles/vm-design/../../../share/misc/docbook.css
>
I don't think so.(but !empty(CSS_SHEET) will be more reasonable.)
Loading doc.html.mk is depend on DOCFORMAT variable (see doc.project.mk).
en_US.ISO8859-1/articles/vm-design/Makefile does not load doc.htmk.mk,
because Makefile does not set DOCFORMAT variable and default value of
DOCFORMAT in doc.project.mk is `docbook'.
Currently, the Makefile that needs doc.htmk.mk is
en_US.ISO8859-1/articles/console-server/Makefile only.
Its Makefile selects local CSS_SHEET.
--- fix ---
--- share/mk/doc.html.mk.OLD Sat Oct 20 17:32:08 2001
+++ share/mk/doc.html.mk Sat Oct 20 17:32:47 2001
@@ -236,7 +236,9 @@
install-${_cf}: ${DOC}.${_cf}
@[ -d ${DESTDIR} ] || mkdir -p ${DESTDIR}
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
+.if !empty(CSS_SHEET)
${INSTALL_DOCS} ${.CURDIR}/${CSS_SHEET} ${DESTDIR}
+.endif
.for _curimage in ${IMAGES_LIB}
@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] || mkdir -p ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
@@ -304,7 +306,7 @@
_cf=${_curformat}
package-${_curformat}: install-${_curformat}
@echo ${DOC}.${_curformat} > PLIST
-.if defined(CSS_SHEET)
+.if !empty(CSS_SHEET)
@echo ${CSS_SHEET} >> PLIST
.endif
@for images_png in ${IMAGES_PNG}; do \
--- fix ---
(snip)
>did you try PR #31131 which exactly cover the same subject w/ some
>cleanup ?
>
I try three patches in PR #31131.
I apply patches by hand, because of tab-space conversion in PR.
In my environment, it seemd that `make' failes without `make obj'.
--- log ---
% cd <somewhere>
% cvs -d <mirror_repository> co doc
<apply three patches in PR# 31131>
% cd doc/en_US.ISO8859-1/articles/console-server
% make
Graph cycles through itgastyle.css
gzip -qf -9 < article.html > article.html.gz
cannot open article.html: no such file
*** Error code 2
Stop in /usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server.
--- log ---
And after `make obj', `make' and `make install' was worked, but
`make package' failed.
--- log ---
% make obj
/usr/obj/usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server created for /usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server
% make
/bin/cp -p /usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server/tk0231-9-1.png /usr/obj/usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server/tk0231-9-1.png
/bin/cp -p /usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server/itgastyle.css /usr/obj/usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server/itgastyle.css
/usr/local/bin/sgmlnorm -c /usr/local/share/sgml/html/catalog /usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server/article.sgml > article.html
/usr/local/bin/tidy -i -m -f /dev/null article.html
*** Error code 1 (ignored)
gzip -qf -9 < article.html > article.html.gz
% make install
install -c -o root -g wheel -m 444 article.html.gz /usr/share/doc/en_US.ISO8859-1/articles/console-server
install -c -o root -g wheel -m 444 article.html /usr/share/doc/en_US.ISO8859-1/articles/console-server
install -c -o root -g wheel -m 444 itgastyle.css /usr/share/doc/en_US.ISO8859-1/articles/console-server
install -c -o root -g wheel -m 444 /usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server/tk0231-9-1.png /usr/share/doc/en_US.ISO8859-1/articles/console-server
% make package
article.html: not found
*** Error code 127
Stop in /usr/local/.tmp/doc/en_US.ISO8859-1/articles/console-server.
--- log ---
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110200900.f9K902N86205>