You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/11/10 00:23:11 UTC
svn commit: r1033290 - /subversion/trunk/Makefile.in
Author: stsp
Date: Tue Nov 9 23:23:10 2010
New Revision: 1033290
URL: http://svn.apache.org/viewvc?rev=1033290&view=rev
Log:
* Makefile.in
(revision-install): Rewrite this a chain of OR'd commands instead of using
if-then-else contructs. It seems that BSD make always errors out if the
first command of semicolon-separated chain of commands fails. So we weren't
falling back to the svnversion binary from PATH if BSD make was used.
Modified:
subversion/trunk/Makefile.in
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1033290&r1=1033289&r2=1033290&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue Nov 9 23:23:10 2010
@@ -413,15 +413,11 @@ local-install: @INSTALL_RULES@
### HACK!! Find a better way to do this
revision-install:
subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$$?" != "0"; then \
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$$?" != "0"; then \
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
echo "unknown" > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- fi; \
- fi;
+ $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
install-static: @INSTALL_STATIC_RULES@
Re: svn commit: r1033290 - /subversion/trunk/Makefile.in
Posted by Stefan Sperling <st...@apache.org>.
On Wed, Nov 10, 2010 at 04:36:02AM -0600, Peter Samuelson wrote:
>
> [stsp@apache.org]
> > --- subversion/trunk/Makefile.in (original)
> > +++ subversion/trunk/Makefile.in Tue Nov 9 23:23:10 2010
> > @@ -413,15 +413,11 @@ local-install: @INSTALL_RULES@
> > ### HACK!! Find a better way to do this
> > revision-install:
> > subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
> > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> > - if test "$$?" != "0"; then \
> > + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
> > svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
> > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> > - if test "$$?" != "0"; then \
> > + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
> > echo "unknown" > \
> > - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> > - fi; \
> > - fi;
> > + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
>
> Stefan, could you test this version on a BSD as well? Should do
> exactly the same thing, and I think it's a little cleaner.
+1, works with BSD make. Thanks!
> Peter
>
> [[[
> * Makefile.in
> (revision-install): Followup r1033290 with an equivalent but slightly
> cleaner way to write svn-revision.txt.
> ]]]
> Index: Makefile.in
> ===================================================================
> --- Makefile.in (revisione 1033405)
> +++ Makefile.in (copia locale)
> @@ -412,12 +412,10 @@
>
> ### HACK!! Find a better way to do this
> revision-install:
> - subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
> - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
> - svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
> - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
> - echo "unknown" > \
> - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
> + (subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) || \
> + svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) || \
> + echo "unknown"; \
> + ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
>
> install-static: @INSTALL_STATIC_RULES@
>
Re: svn commit: r1033290 - /subversion/trunk/Makefile.in
Posted by Peter Samuelson <pe...@p12n.org>.
[stsp@apache.org]
> --- subversion/trunk/Makefile.in (original)
> +++ subversion/trunk/Makefile.in Tue Nov 9 23:23:10 2010
> @@ -413,15 +413,11 @@ local-install: @INSTALL_RULES@
> ### HACK!! Find a better way to do this
> revision-install:
> subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
> - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> - if test "$$?" != "0"; then \
> + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
> svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
> - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> - if test "$$?" != "0"; then \
> + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
> echo "unknown" > \
> - $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
> - fi; \
> - fi;
> + $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
Stefan, could you test this version on a BSD as well? Should do
exactly the same thing, and I think it's a little cleaner.
Peter
[[[
* Makefile.in
(revision-install): Followup r1033290 with an equivalent but slightly
cleaner way to write svn-revision.txt.
]]]
Index: Makefile.in
===================================================================
--- Makefile.in (revisione 1033405)
+++ Makefile.in (copia locale)
@@ -412,12 +412,10 @@
### HACK!! Find a better way to do this
revision-install:
- subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
- svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt || \
- echo "unknown" > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
+ (subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) || \
+ svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) || \
+ echo "unknown"; \
+ ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
install-static: @INSTALL_STATIC_RULES@