Skip to content
Browse files

revert r62021 (R-devel only)

git-svn-id: https://svn.r-project.org/R/branches/R-2-15-branch@61362 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 760a858 commit 41c76d1b77043dc79c1a83f088e0538f506b8a3c ripley committed Dec 17, 2012
Showing with 7 additions and 15 deletions.
  1. +0 −3 doc/NEWS.Rd
  2. +4 −9 src/main/version.c
  3. +1 −1 src/unix/Rscript.c
  4. +2 −2 tools/GETVERSION
View
3 doc/NEWS.Rd
@@ -32,9 +32,6 @@
\subsection{C-LEVEL FACILITIES}{
\itemize{
- \item \code{R_SVN_REVISION} in \file{Rversion.h} is now an integer
- and hence usable as e.g. \code{#if R_SVN_REVISION < 70000}.
-
\item On a 64-bit Windows platform with enough RAM, \code{R_alloc}
can now allocate up to just under 32GB like other 64-bit
platforms.
View
13 src/main/version.c
@@ -77,9 +77,7 @@ SEXP attribute_hidden do_version(SEXP call, SEXP op, SEXP args, SEXP env)
SET_STRING_ELT(names, 9, mkChar("day"));
SET_VECTOR_ELT(value, 9, mkString(R_DAY));
SET_STRING_ELT(names, 10, mkChar("svn rev"));
-
- sprintf(buf,"%d", R_SVN_REVISION);
- SET_VECTOR_ELT(value, 10, mkString(buf));
+ SET_VECTOR_ELT(value, 10, mkString(R_SVN_REVISION));
SET_STRING_ELT(names, 11, mkChar("language"));
SET_VECTOR_ELT(value, 11, mkString("R"));
@@ -108,22 +106,19 @@ void attribute_hidden PrintVersion(char *s)
void attribute_hidden PrintVersionString(char *s)
{
- char R_SVN_char[8];
- sprintf(R_SVN_char, "%d", R_SVN_REVISION);
-
- if(strcmp(R_SVN_char, "unknown") == 0) {
+ if(strcmp(R_SVN_REVISION, "unknown") == 0) {
sprintf(s, "R version %s.%s %s (%s-%s-%s)",
R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY);
} else if(strlen(R_STATUS) == 0) {
sprintf(s, "R version %s.%s (%s-%s-%s)",
R_MAJOR, R_MINOR, R_YEAR, R_MONTH, R_DAY);
} else if(strcmp(R_STATUS, "Under development (unstable)") == 0) {
sprintf(s, "R %s (%s-%s-%s r%s)",
- R_STATUS, R_YEAR, R_MONTH, R_DAY, R_SVN_char);
+ R_STATUS, R_YEAR, R_MONTH, R_DAY, R_SVN_REVISION);
} else {
sprintf(s, "R version %s.%s %s (%s-%s-%s r%s)",
R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY,
- R_SVN_char);
+ R_SVN_REVISION);
}
}
View
2 src/unix/Rscript.c
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "R scripting front-end version %s.%s (%s-%s-%s)\n",
R_MAJOR, R_MINOR, R_YEAR, R_MONTH, R_DAY);
else
- fprintf(stderr, "R scripting front-end version %s.%s %s (%s-%s-%s r%d)\n",
+ fprintf(stderr, "R scripting front-end version %s.%s %s (%s-%s-%s r%s)\n",
R_MAJOR, R_MINOR, R_STATUS, R_YEAR, R_MONTH, R_DAY,
R_SVN_REVISION);
exit(0);
View
4 tools/GETVERSION
@@ -40,7 +40,7 @@ TOOLS_DIR=`echo ${0} | sed 's%/[^/][^/]*$%%'`
echo "#define R_YEAR \"${y}\""
echo "#define R_MONTH \"${m}\""
echo "#define R_DAY \"${d}\""
- echo "#define R_SVN_REVISION ${svn_rev}"
+ echo "#define R_SVN_REVISION \"${svn_rev}\""
## Using 1-digit year stops problems with leading zeros
# echo "#define R_FILEVERSION ${maj},${pl}${sl},${y1}${m}${d},0"
echo "#define R_FILEVERSION ${maj},${pl}${sl},${svn_rev},0"
@@ -50,4 +50,4 @@ TOOLS_DIR=`echo ${0} | sed 's%/[^/][^/]*$%%'`
echo '#endif'
echo
echo "#endif /* not R_VERSION_H */")
-
+

0 comments on commit 41c76d1

Please sign in to comment.
Something went wrong with that request. Please try again.