[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Fix version.xml bugs

From: Bruce A. Mah <bmah_at_packetdesign.com>
Date: 2003-05-22 16:59:11 CEST

Reposted by request...

Bruce.

-----

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 Thu May 22 17:00:17 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.