[rkward-cvs] [rkward] packages/rkwarddev: rkwarddev: remain backwards compatible with R < 3

[m.eik michalke]

Git commit a584733163413e1c602491422b645c620399e5f8 by m.eik michalke.
Committed on 19/11/2014 at 21:17.
Pushed by meikm into branch 'master'.

rkwarddev: remain backwards compatible with R < 3
i also discovered a minor bug by accident -- rk.XML.pluginmap() generated invalid attributes for labels, is now fixed.

M  +3    -1    packages/rkwarddev/ChangeLog
M  +2    -2    packages/rkwarddev/R/rk.XML.pluginmap.R
M  +2    -1    packages/rkwarddev/R/rk.build.plugin.R

http://commits.kde.org/rkward/a584733163413e1c602491422b645c620399e5f8

diff --git a/packages/rkwarddev/ChangeLog b/packages/rkwarddev/ChangeLog
index 7da97fc..5d28b84 100644
--- a/packages/rkwarddev/ChangeLog
+++ b/packages/rkwarddev/ChangeLog
@@ -1,11 +1,13 @@
 ChangeLog for package rkwarddev
 
-changes in version 0.06-6 (2014-11-09)
+changes in version 0.06-6 (2014-11-19)
 fixed:
   - rk.XML.optionset() does now allow to re-use objects defined in the same
     function call (i.e., refer to optioncolumns in the logic section)
   - removed arguments "help" and "component" from rk.XML.optionscolumn() again,
     as these are already being documented via the objects they connect to.
+  - rk.build.plugin() was still only using the "--no-vignettes" option from R < 3
+  - rk.XML.pluginmap() malformed label argument names if they referred to standrad maneu entries
 added:
   - all "help" values can now be a list of character strings or XiMpLe nodes,
     to have more control over the markup
diff --git a/packages/rkwarddev/R/rk.XML.pluginmap.R b/packages/rkwarddev/R/rk.XML.pluginmap.R
index e89eda2..767c914 100644
--- a/packages/rkwarddev/R/rk.XML.pluginmap.R
+++ b/packages/rkwarddev/R/rk.XML.pluginmap.R
@@ -221,7 +221,7 @@ rk.XML.pluginmap <- function(name, about=NULL, components, hierarchy="test",
               })
 
             hier.XML <- rk.XML.menu(
-              label=unlist(main.menu[this.hier[[1]]]),
+              label=unlist(main.menu[[this.hier[[1]]]]),
               new.hierarchy,
               id.name=id.names)
           } else {
@@ -237,7 +237,7 @@ rk.XML.pluginmap <- function(name, about=NULL, components, hierarchy="test",
 
           if(this.hier %in% names(main.menu)){
             hier.XML <- rk.XML.menu(
-              label=main.menu[this.hier],
+              label=main.menu[[this.hier]],
               entry.XML,
               id.name=this.hier)
           } else {
diff --git a/packages/rkwarddev/R/rk.build.plugin.R b/packages/rkwarddev/R/rk.build.plugin.R
index a59f035..8fb5799 100644
--- a/packages/rkwarddev/R/rk.build.plugin.R
+++ b/packages/rkwarddev/R/rk.build.plugin.R
@@ -71,7 +71,8 @@ rk.build.plugin <- function(plugin, check=FALSE, install=FALSE, R.libs=NULL){
   } else {}
 
   setwd(build.path)
-  r.cmd.build.call <- paste0(R.bin, " CMD build --no-build-vignettes ", plugin.path, " || exit 1")
+  r.cmd.opt.novignettes <- ifelse(isTRUE(R.version$major < 3), "--no-vignettes ", "--no-build-vignettes ")
+  r.cmd.build.call <- paste0(R.bin, " CMD build ", r.cmd.opt.novignettes, plugin.path, " || exit 1")
   system(r.cmd.build.call, intern=TRUE)
   message(paste0("build: package built as ", package.path))