[rkward-cvs] SF.net SVN: rkward-code:[4534] trunk/rkward/packages/rkwarddev

[m-eik at users.sf.net]

Revision: 4534
          http://sourceforge.net/p/rkward/code/4534
Author:   m-eik
Date:     2013-02-15 13:52:55 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
rkwarddev: rk.XML.pluginmap() now uses the <dependencies> node from <about>, if found, and moves it to its proper place

Modified Paths:
--------------
    trunk/rkward/packages/rkwarddev/ChangeLog
    trunk/rkward/packages/rkwarddev/DESCRIPTION
    trunk/rkward/packages/rkwarddev/R/rk.XML.pluginmap.R
    trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
    trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd

Modified: trunk/rkward/packages/rkwarddev/ChangeLog
===================================================================
--- trunk/rkward/packages/rkwarddev/ChangeLog	2013-02-11 21:15:36 UTC (rev 4533)
+++ trunk/rkward/packages/rkwarddev/ChangeLog	2013-02-15 13:52:55 UTC (rev 4534)
@@ -1,10 +1,14 @@
 ChangeLog for package rkwarddev
 
-changes in version 0.06-2 (2013-02-08)
+changes in version 0.06-2 (2013-02-15)
 changed:
   - the structure of <about> nodes will change in RKWard 0.6.1, <dependencies> will become
-    a direct child of <document> or <component>, which explains several changes in this release
+    a direct child of <document> or <component>, which explains several changes in this release.
+    this is not really critical, because this information wasn't evaluated by RKWard until now
+    anyway
   - for consistency, from now on <component> is never an empty node
+  - rk.XML.pluginmap() will now move <dependencies> from <about> to a top level child node
+    of plugin maps, with a warning
 added:
   - new function rk.XML.matrix()
   - new function rk.XML.dependencies()

Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION	2013-02-11 21:15:36 UTC (rev 4533)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION	2013-02-15 13:52:55 UTC (rev 4534)
@@ -6,8 +6,8 @@
 Depends:
     R (>= 2.9.0),methods,XiMpLe (>= 0.03-18),rkward (>= 0.5.6)
 Enhances: rkward
-Description: Provides functions to create plugin skeletons and XML
-    structures for RKWard.
+Description: Provides functions to create plugin skeletons and XML structures
+    for RKWard.
 License: GPL (>= 3)
 Encoding: UTF-8
 LazyLoad: yes
@@ -15,7 +15,7 @@
 Authors at R: c(person(given="Meik", family="Michalke",
     email="meik.michalke at hhu.de", role=c("aut", "cre")))
 Version: 0.06-2
-Date: 2013-02-08
+Date: 2013-02-15
 Collate:
     'echo.R'
     'id.R'

Modified: trunk/rkward/packages/rkwarddev/R/rk.XML.pluginmap.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.XML.pluginmap.R	2013-02-11 21:15:36 UTC (rev 4533)
+++ trunk/rkward/packages/rkwarddev/R/rk.XML.pluginmap.R	2013-02-15 13:52:55 UTC (rev 4534)
@@ -71,7 +71,18 @@
 		# initialize all.children list
 		all.children[[length(all.children)+1]] <- dependencies
 	} else {
-		if(isTRUE(hints)){
+		## wrapper for compatibility with earlier releases
+		# check for <dependencies> in <about>, and if found,
+		# take it out and use it here
+		deps.in.about <- try(
+			node(about, node=list("about","dependencies")),
+			silent=TRUE)
+		if(is.XiMpLe.node(deps.in.about)){
+			warning("<dependencies> inside <about> is deprecated, use the 'dependencies' argument instead!")
+			all.children[[length(all.children)+1]] <- deps.in.about
+			# remove <dependencies> from <about>
+			node(about, node=list("about","dependencies")) <- NULL
+		} else if(isTRUE(hints)){
 			dependencies.XML <- XMLNode("!--", XMLNode("dependencies", ""))
 			# initialize all.children list
 			all.children[[length(all.children)+1]] <- dependencies.XML

Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R	2013-02-11 21:15:36 UTC (rev 4533)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R	2013-02-15 13:52:55 UTC (rev 4534)
@@ -4,7 +4,7 @@
 #' Package: \tab rkwarddev\cr
 #' Type: \tab Package\cr
 #' Version: \tab 0.06-2\cr
-#' Date: \tab 2013-02-08\cr
+#' Date: \tab 2013-02-15\cr
 #' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-18),rkward (>= 0.5.6)\cr
 #' Enhances: \tab rkward\cr
 #' Encoding: \tab UTF-8\cr

Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd	2013-02-11 21:15:36 UTC (rev 4533)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd	2013-02-15 13:52:55 UTC (rev 4534)
@@ -9,7 +9,7 @@
 \details{
   \tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
   Package\cr Version: \tab 0.06-2\cr Date: \tab
-  2013-02-08\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
+  2013-02-15\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
   (>= 0.03-18),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