If memory serves me right, Ben Collins-Sussman wrote:
> Olaf Hering <olh@suse.de> writes:
>
> > + make doc-all-html
> > echo '<!ENTITY svn.version "'`svnversion .`'">' > ./book/version.xml
> > /bin/sh: line 1: svnversion: command not found
>
> Perhaps we shouldn't require that svn binaries be installed just to
> compile the documentation, eh?
>
> Maybe doc/book/Makefile should test for the existence of 'svnversion'
> in $PATH first, and do something sensible if not available?
My profuse apologies. I have not taken the time to understand the
subversion release-generating process and I had mistakenly thought that
the generated doc/book/book/version.xml file would get included in the
distribution tarball. Is it possible to do this?
Regardless, the following patch (not well-tested) *should* fix the doc
breakage and in general make this more robust.
Bruce.
PS. Do you subversion folks give out pointy hats for breakages like on
the FreeBSD project? If so, please give me one more for my collection.
:-)
-----
Handle the case that "svnversion ." doesn't work (i.e. we don't have
an svnversion executable in our $PATH or we aren't building inside a
checked-out working copy).
* doc/book/Makefile:
$(BOOK_VERSION_SOURCE): Check to see if "svnversion ." produces
an error before trying to use its output. Provide a fallback
for the version.xml entity if this doesn't work.
* doc/book/book.xml: Let version.xml provide the complete subtitle
text.
Index: book/book.xml
===================================================================
--- book/book.xml (revision 5982)
+++ book/book.xml (working copy)
@@ -28,7 +28,7 @@
<!-- Using revnumber would be more appropriate, but our stylesheets -->
<!-- don't seem to render it. -->
- <subtitle>Draft Revision &svn.version;</subtitle>
+ <subtitle>&svn.version;</subtitle>
<bookinfo>
Index: Makefile
===================================================================
--- Makefile (revision 5982)
+++ Makefile (working copy)
@@ -64,7 +64,11 @@
clean: book-clean misc-docs-clean
$(BOOK_VERSION_SOURCE):
- echo '<!ENTITY svn.version "'`$(SVNVERSION) .`'">' > $(BOOK_VERSION_SOURCE)
+ if $(SVNVERSION) .; then \
+ echo '<!ENTITY svn.version "Draft Revision '`$(SVNVERSION) .`'">' > $(BOOK_VERSION_SOURCE); \
+ else \
+ echo '<!ENTITY svn.version "Draft">' > $(BOOK_VERSION_SOURCE); \
+ fi
book-html: $(BOOK_HTML_TARGET)
- application/pgp-signature attachment: stored
Received on Mon May 19 19:48:47 2003