[rkward-cvs] SF.net SVN: rkward:[4026] trunk/rkward/packages/rkwarddev
m-eik at users.sourceforge.net
m-eik at users.sourceforge.net
Thu Nov 10 00:50:23 UTC 2011
Revision: 4026
http://rkward.svn.sourceforge.net/rkward/?rev=4026&view=rev
Author: m-eik
Date: 2011-11-10 00:50:23 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
rkwarddev: if a package has no NAMESPACE file, R 2.14 creates one and adds "Namespace: auto" to the DESCRIPTION file, which will make the source archive invalid(!) for earlier R versions. rkwarddev now creates an empty NAMESPACE dummy to avoid this.
Modified Paths:
--------------
trunk/rkward/packages/rkwarddev/ChangeLog
trunk/rkward/packages/rkwarddev/DESCRIPTION
trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R
trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
trunk/rkward/packages/rkwarddev/inst/CITATION
trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
Modified: trunk/rkward/packages/rkwarddev/ChangeLog
===================================================================
--- trunk/rkward/packages/rkwarddev/ChangeLog 2011-11-08 23:29:51 UTC (rev 4025)
+++ trunk/rkward/packages/rkwarddev/ChangeLog 2011-11-10 00:50:23 UTC (rev 4026)
@@ -1,5 +1,9 @@
ChangeLog for package rkwarddev
+## 0.04-8 (2011-11-10)
+ - R 2.14 creates source archives which are incompatible with earlier versions. attempt to deal with this
+ by adding empty R directory and NAMESPACE file
+
## 0.04-7 (2011-11-08)
- added long description support to rk.XML.about(), used for the DESCRIPTION file
Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION 2011-11-08 23:29:51 UTC (rev 4025)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION 2011-11-10 00:50:23 UTC (rev 4026)
@@ -14,8 +14,8 @@
URL: http://rkward.sourceforge.net
Authors at R: c(person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut", "cre")))
-Version: 0.04-7
-Date: 2011-11-08
+Version: 0.04-8
+Date: 2011-11-10
Collate:
'echo.R'
'id.R'
Modified: trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R 2011-11-08 23:29:51 UTC (rev 4025)
+++ trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R 2011-11-10 00:50:23 UTC (rev 4026)
@@ -158,7 +158,9 @@
# define paths an file names
main.dir <- file.path(path, name)
+ R.dir <- file.path(main.dir, "R")
description.file <- file.path(main.dir, "DESCRIPTION")
+ namespace.file <- file.path(main.dir, "NAMESPACE")
rkward.dir <- file.path(main.dir, "inst", "rkward")
plugin.dir <- file.path(rkward.dir, "plugins")
# the basic file names
@@ -176,6 +178,12 @@
message(paste("Created directory ", main.dir, ".", sep=""))
} else {}
+ # create empty R directory, e.g. for smooth roxyPackage runs
+ if(!file_test("-d", R.dir)){
+ stopifnot(dir.create(R.dir, recursive=TRUE))
+ message(paste("Created directory ", R.dir, ".", sep=""))
+ } else {}
+
# create directory structure
if(!file_test("-d", plugin.dir)){
stopifnot(dir.create(plugin.dir, recursive=TRUE))
@@ -343,6 +351,8 @@
# Encoding="UTF-8",
LazyLoad=ifelse(isTRUE(lazyLoad), "yes", "no"),
URL=about.node at attributes[["url"]],
+# # R 2.14 seems to add "Namespace: auto", which invalidates source packages for R < 2.14
+# Namespace=name,
stringsAsFactors=FALSE)
for(this.entry in c("Depends","Suggests")){
@@ -360,6 +370,11 @@
if(isTRUE(edit)){
rk.edit.files(description.file, title="DESCRIPTION", prompt=FALSE)
} else {}
+ # create empty NAMESPACE file for R 2.14 compatibility
+ if(!file_test("-f", namespace.file)){
+ cat("", file=namespace.file)
+ message(paste("Created empty file ", namespace.file, " for R 2.14 compatibility.", sep=""))
+ } else {}
} else {}
return(main.dir)
Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2011-11-08 23:29:51 UTC (rev 4025)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2011-11-10 00:50:23 UTC (rev 4026)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.04-7\cr
-#' Date: \tab 2011-11-08\cr
+#' Version: \tab 0.04-8\cr
+#' Date: \tab 2011-11-10\cr
#' Depends: \tab R (>= 2.9.0),XiMpLe,rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
Modified: trunk/rkward/packages/rkwarddev/inst/CITATION
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/CITATION 2011-11-08 23:29:51 UTC (rev 4025)
+++ trunk/rkward/packages/rkwarddev/inst/CITATION 2011-11-10 00:50:23 UTC (rev 4026)
@@ -2,12 +2,12 @@
title="rkwarddev: A collection of tools for RKWard plugin development",
author="Meik Michalke",
year="2011",
- note="(Version 0.04-7)",
+ note="(Version 0.04-8)",
url="http://rkward.sourceforge.net",
textVersion =
paste("Michalke, M. (2011). ",
- "rkwarddev: A collection of tools for RKWard plugin development (Version 0.04-7). ",
+ "rkwarddev: A collection of tools for RKWard plugin development (Version 0.04-8). ",
"Available from http://rkward.sourceforge.net",
sep=""),
Modified: trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
===================================================================
(Binary files differ)
Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2011-11-08 23:29:51 UTC (rev 4025)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2011-11-10 00:50:23 UTC (rev 4026)
@@ -8,8 +8,8 @@
}
\details{
\tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
- Package\cr Version: \tab 0.04-7\cr Date: \tab
- 2011-11-08\cr Depends: \tab R (>= 2.9.0),XiMpLe,rkward
+ Package\cr Version: \tab 0.04-8\cr Date: \tab
+ 2011-11-10\cr Depends: \tab R (>= 2.9.0),XiMpLe,rkward
(>= 0.5.6)\cr Enhances: \tab rkward\cr Encoding: \tab
UTF-8\cr License: \tab GPL (>= 3)\cr LazyLoad: \tab
yes\cr URL: \tab http://rkward.sourceforge.net\cr }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list