Permalink
Browse files

updates for SVN 1.4.0

git-svn-id: https://svn.r-project.org/R/trunk@39448 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent fb930da commit 7b2964779440ace3935715af7b3b606993a9e8ab ripley committed Sep 21, 2006
Showing with 18 additions and 15 deletions.
  1. +1 −8 Makefile.in
  2. +10 −2 NEWS
  3. +7 −5 src/include/Makefile.win
View
@@ -104,14 +104,7 @@ svnonly:
touch non-tarball ; \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || echo "Revision: unknown") 2> /dev/null \
| sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
- | cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
- if grep unknown SVN-REVISION-tmp > /dev/null ; then \
- echo "Last Changed Date: Today" >> SVN-REVISION-tmp ; \
- if test -f "$(srcdir)/.svn/entries" ; then \
- rev=`grep committed-rev "$(srcdir)/.svn/entries" | head -1 | sed -e 's/^ *committed-rev=\"//' -e 's/\"//'`; \
- cdate=`grep committed-date "$(srcdir)/.svn/entries" | head -1 | sed -e 's/^ *committed-date=\"//' -e 's/T.*//'`; \
- sed -e "s/unknown/$${rev}/" -e "s/Today/$${cdate}/" SVN-REVISION-tmp > SVN-REVISION-tmp2; mv SVN-REVISION-tmp2 SVN-REVISION-tmp ; \
- fi ; \
+ | cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
fi ; \
$(top_srcdir)/tools/move-if-change SVN-REVISION-tmp SVN-REVISION ; \
rm -f SVN-REVISION-tmp ; \
View
12 NEWS
@@ -30,13 +30,21 @@ NEW FEATURES
utils.
+INSTALLATION
+
+ o The extraction of info from Subversion for an SVN checkout now
+ also works for svn >= 1.4.0. However, on Windows the 'Last
+ Changed Date' will be in the local timezone, and not in GMT as
+ previously.
+
+
DEPRECATED & DEFUNCT
o symbol.C() and symbol.For() are defunct, and have been
replaced by wrappers that give a warning.
- o Calling a builtin function with empty arguments is now always an
- error.
+ o Calling a builtin function with an empty argument is now always
+ an error.
o The autoloading of ts() is defunct.
View
@@ -78,7 +78,8 @@ Rmath.h: Rmath.h0
## If we do not have svn, get the old file from SVN-REVISION.bak (if poss).
## This needs to be copy-on-change.
-## We don't get the date from svn info as it is not in GMT.
+## The date from svn info is not in GMT, but we have decided to live
+## with that as they changed the format in svn 1.4.x
## <FIXME> USE_SVNVERSION does not work if there is no 'svnversion'
FORCE:
$(R_HOME)/SVN-REVISION: FORCE
@@ -95,9 +96,10 @@ else
rm svn-tmp; \
fi
endif
- @if test -f svn-tmp && test -f "../../.svn/entries" ; then \
- cdate=`grep committed-date "../../.svn/entries" | sed -n 1p | sed -e 's/^ *committed-date=\"//' -e 's/T.*//'` ; \
- echo "Last Changed Date: $${cdate}" >> svn-tmp ; \
+ @if test -f svn-tmp ; then \
+ (cd ../..; LC_ALL=C TZ=GMT svn info || echo "Last Changed Date: unknown") 2> /dev/null \
+ | sed -n '/^Last Changed Date:/p' | sed 's/[0-9][0-9]:.*//' \
+ >> svn-tmp ; \
else \
rm -f svn-tmp ; \
fi
@@ -108,7 +110,7 @@ endif
else \
cp -p $(R_HOME)/SVN-REVISION.bak $@ 2> /dev/null || \
(echo "Revision: 00000" > $@; \
- echo "Last Changed Date: 2005-00-00" >> $@) ; \
+ echo "Last Changed Date: 2006-00-00" >> $@) ; \
fi
@rm -f svn-tmp $(R_HOME)/SVN-REVISION.bak

0 comments on commit 7b29647

Please sign in to comment.