[Distr-commits] r1173 - in branches/distr-2.7/pkg: . utils

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2018-07-08 15:51:29 +0200 (Sun, 08 Jul 2018)
New Revision: 1173

Removed:
   branches/distr-2.7/pkg/versuch.txt
Modified:
   branches/distr-2.7/pkg/utils/DESCRIPTIONutils.R
   branches/distr-2.7/pkg/utils/DESCRIPTIONutilsExamples.R
Log:
updated utils in branch 2.7 

Modified: branches/distr-2.7/pkg/utils/DESCRIPTIONutils.R
===================================================================
--- branches/distr-2.7/pkg/utils/DESCRIPTIONutils.R	2018-07-08 13:50:09 UTC (rev 1172)
+++ branches/distr-2.7/pkg/utils/DESCRIPTIONutils.R	2018-07-08 13:51:29 UTC (rev 1173)
@@ -54,14 +54,16 @@
         startD <- gsub("/branches/[^/]+","",startDir)
         if(is.null(pathRepo)) pathRepo <- gsub(".*/([^/]+)/*$","\\1", startD)
         svnrev <- getRevNr(startD, pathRepo, inRforge, withlogin,
-                           PathToBash, PathToreadsvnlog.sh)[[1]]
+                           PathToBash, PathToreadsvnlog.sh)
         print(svnrev)
+
         if("SVNRevision" %in% names){
-           values[which(names=="SVNRevision"),] <- svnrev
+           values[which(names=="SVNRevision"),] <- c(svnrev[[1]])
         }else{
            nr <- nrow(values)
            names <- c(names,"SVNRevision")
-           values <- rbind(values,rep(svnrev,ncol(values)))
+           vlsvn <- rep(c(svnrev[[1]]),ncol(values))
+           values <- base::rbind(values,vlsvn)
            rownames(values)[nr+1] <- "SVNRevision"
         }
     }
@@ -70,7 +72,7 @@
            nr <- nrow(values)
            dat <- format(Sys.time(), format="%Y-%m-%d")
            names <- c(names,"Date")
-           values <- rbind(values,rep(dat,ncol(values)))
+           values <- base::rbind(values,rep(dat,ncol(values)))
            rownames(values)[nr+1] <- "Date"
        }
     }
@@ -85,6 +87,7 @@
        if(length(idx)) idx <- -idx else idx <- TRUE
        pkgs <- pkgs[idx]
     }
+    print(values)
     if (length(pkgs) && length(names) && length(values)){
        pkgs <- pkgs[sapply(pkgs, function(x)
                    file.exists(file.path("pkg",x,"DESCRIPTION")))]

Modified: branches/distr-2.7/pkg/utils/DESCRIPTIONutilsExamples.R
===================================================================
--- branches/distr-2.7/pkg/utils/DESCRIPTIONutilsExamples.R	2018-07-08 13:50:09 UTC (rev 1172)
+++ branches/distr-2.7/pkg/utils/DESCRIPTIONutilsExamples.R	2018-07-08 13:51:29 UTC (rev 1173)
@@ -98,5 +98,18 @@
 Values["Version",,drop=FALSE] <- c("0.9.1", "0.7", rep("2.6",6))
 changeDescription(startDir = "C:/rtest/distr/branches/distr-2.6",names=Names,
                   pkgs=Pkgs, values=Values)
+
+
+Pkgs <- c("startupmsg", "distr", "distrEx", "distrDoc", "distrSim",
+          "distrTeach", "distrMod",
+          "distrTEst", "distrEllipse", "distrRmetrics")
+Names <- c("Version")
+Values <- matrix(c("2.8"),1,length(Pkgs))
+colnames(Values) <- Pkgs
+rownames(Values) <- Names
+Values["Version",] <- matrix(c("0.9.1", rep("2.8.0",9)),1,10)
+changeDescription(startDir = "C:/rtest/distr/branches/distr-2.8",names=Names,
+                  pkgs=Pkgs, values=Values, verbose=TRUE)
 }
+
 ##############################################################################

Deleted: branches/distr-2.7/pkg/versuch.txt
===================================================================
--- branches/distr-2.7/pkg/versuch.txt	2018-07-08 13:50:09 UTC (rev 1172)
+++ branches/distr-2.7/pkg/versuch.txt	2018-07-08 13:51:29 UTC (rev 1173)
@@ -1 +0,0 @@
-probleme beim commit 
\ No newline at end of file