Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge r45054 from trunk

git-svn-id: https://svn.r-project.org/R/branches/R-2-6-branch@45056 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit 0d4fd0874fca2d0aa7e7bd3e06cfe991f7d8eeeb 1 parent 7f34a12
murdoch authored
View
6 src/gnuwin32/Makefile
@@ -29,6 +29,8 @@ FULLVERSION=`cat ../../VERSION`
DATE = $(shell date +%F)
+SVNREVISION=`sed -e 1s/Revision:.// -e q <$(RHOME)/SVN-REVISION`
+
RLIB = $(RHOME)/library
PKGDIR = $(RHOME)/src/library
@@ -612,18 +614,22 @@ crandir:
$(SED) -e s/@RWVER@/$(RPREFIX)/g \
-e s/@RVER@/$(RVER)/g \
-e "s/@DATE@/$(DATE)/g" \
+ -e "s/@SVNREVISION@/$(SVNREVISION)/g" \
-e "s/@FULLVERSION@/$(FULLVERSION)/g" cran/index.in > cran/index.html
$(SED) -e s/@RWVER@/$(RPREFIX)/g \
-e s/@RVER@/$(RVER)/g \
-e "s/@DATE@/$(DATE)/g" \
+ -e "s/@SVNREVISION@/$(SVNREVISION)/g" \
-e "s/@FULLVERSION@/$(FULLVERSION)/g" cran/rdevel.in > cran/rdevel.html
$(SED) -e s/@RWVER@/$(RPREFIX)/g \
-e s/@RVER@/$(RVER)/g \
-e "s/@DATE@/$(DATE)/g" \
+ -e "s/@SVNREVISION@/$(SVNREVISION)/g" \
-e "s/@FULLVERSION@/$(FULLVERSION)/g" cran/rpatched.in > cran/rpatched.html
$(SED) -e s/@RWVER@/$(RPREFIX)/g \
-e s/@RVER@/$(RVER)/g \
-e "s/@DATE@/$(DATE)/g" \
+ -e "s/@SVNREVISION@/$(SVNREVISION)/g" \
-e "s/@FULLVERSION@/$(FULLVERSION)/g" cran/rtest.in > cran/rtest.html
$(SED) -e s/@RWVER@/$(RPREFIX)/g cran/release.in > cran/release.htm
(cd cran;\
View
3  src/gnuwin32/cran/index.in
@@ -10,7 +10,8 @@
<h1>R-@RVER@ for Windows</h1>
-<p>This directory contains a Windows binary distribution of R-@RVER@.</p>
+<p>This directory contains a Windows binary distribution of R-@RVER@
+(r@SVNREVISION@).</p>
<p>Patches to this release are incorporated in the <a
href="rpatched.html">r-patched snapshot build</a>.</p>
View
5 src/gnuwin32/cran/rdevel.in
@@ -10,8 +10,9 @@
<h1>R-@FULLVERSION@ build for Windows</h1>
-<p>This directory contains a Windows binary build of the @DATE@ development
-snapshot of R (which will eventually become R-@RVER@).</p>
+<p>This directory contains a Windows binary build of the @DATE@
+r@SVNREVISION@ development snapshot of R (which will eventually become
+R-@RVER@).</p>
<p>This is a development version of R. <strong>It likely contains
bugs, so be careful if you use it</strong>. Please don't report bugs
View
2  src/gnuwin32/cran/rpatched.in
@@ -11,7 +11,7 @@
<h1>R-@FULLVERSION@ build for Windows</h1>
<p>This directory contains a Windows binary build of R including
-patches up to @DATE@.</p>
+patches up to @DATE@ (r@SVNREVISION@).</p>
<p>This is not an official release of R. Please check bugs
in this version against the official release before reporting them. </p>
View
4 src/gnuwin32/cran/rtest.in
@@ -10,8 +10,8 @@
<h1>R-@FULLVERSION@ build for Windows</h1>
-<p>This directory contains a Windows binary build of the @DATE@
-snapshot of R (which will soon become R-@RVER@).</p>
+<p>This directory contains a Windows binary build of the @DATE@
+r@SVNREVISION@ snapshot of R (which will soon become R-@RVER@).</p>
<p>This is a test version of R. <strong>It may contain
bugs, so please watch results carefully as you use it</strong>.
Please sign in to comment.
Something went wrong with that request. Please try again.