[Distr-commits] r1174 - pkg/utils

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sun Jul 8 16:20:16 CEST 2018


Author: ruckdeschel
Date: 2018-07-08 16:20:16 +0200 (Sun, 08 Jul 2018)
New Revision: 1174

Modified:
   pkg/utils/DESCRIPTIONutils.R
   pkg/utils/DESCRIPTIONutilsExamples.R
   pkg/utils/compactify-Vignettes.R
   pkg/utils/finde.R
Log:
[utils] Update / Branch 2.7 merged back into trunk 

Modified: pkg/utils/DESCRIPTIONutils.R
===================================================================
--- pkg/utils/DESCRIPTIONutils.R	2018-07-08 13:51:29 UTC (rev 1173)
+++ pkg/utils/DESCRIPTIONutils.R	2018-07-08 14:20:16 UTC (rev 1174)
@@ -24,7 +24,7 @@
 }
 
 ## needs: getRevNr() in getRevNr.R in  utils/ e.g.
-## source("C:/rtest/distr/branches/distr-2.4/pkg/utils/getRevNr.R")
+## source("C:/rtest/distr/branches/distr-2.7/pkg/utils/getRevNr.R")
 
   changeDescription <- function(startDir ## folder with pkgs to be updated,
                              ### e.g. "C:/rtest/distr/branches/distr-2.6"
@@ -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: pkg/utils/DESCRIPTIONutilsExamples.R
===================================================================
--- pkg/utils/DESCRIPTIONutilsExamples.R	2018-07-08 13:51:29 UTC (rev 1173)
+++ pkg/utils/DESCRIPTIONutilsExamples.R	2018-07-08 14:20:16 UTC (rev 1174)
@@ -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)
 }
+
 ##############################################################################

Modified: pkg/utils/compactify-Vignettes.R
===================================================================
--- pkg/utils/compactify-Vignettes.R	2018-07-08 13:51:29 UTC (rev 1173)
+++ pkg/utils/compactify-Vignettes.R	2018-07-08 14:20:16 UTC (rev 1174)
@@ -1,8 +1,8 @@
 ########## compactify all vignettes
 compactVignettes <- function(startDir="C:/rtest",rforgeproject="distr",
-                      qpdf = "C:/R/qpdf-4.0.0/bin/qpdf",
-                      gs = "C:/Program Files (x86)/Ghostscript/gs9.00/bin/gswin32",
-                      select = "distr-2.5", invert = FALSE){
+                      qpdf = "C:/R/qpdf-7.0.0/bin/qpdf",
+                      gs = "C:/Program Files (x86)/gs/gs9.22/bin/gswin32",
+                      select = "distr-2.7", invert = FALSE){
      startD <- file.path(startDir,rforgeproject)
      dir0 <- paste(startD,dir(startD, recursive=TRUE),sep="/")
      dir1 <- grep("inst/doc/.+\\.pdf",dir0,value=TRUE)

Modified: pkg/utils/finde.R
===================================================================
--- pkg/utils/finde.R	2018-07-08 13:51:29 UTC (rev 1173)
+++ pkg/utils/finde.R	2018-07-08 14:20:16 UTC (rev 1174)
@@ -20,18 +20,12 @@
   }
 infind(dir)   
 }
+finde(x="q\\(", dir ="C:/rtest/distr/branches/distr-2.7/pkg/", rec=TRUE)
+finde(x="http\\:/", dir ="C:/rtest/distr/branches/distr-2.7/pkg/distr/", rec=TRUE)
 #finde(x="Wow6432Node", dir ="C:/R/devel/src/gnuwin32", rec=TRUE, ext="")
+finde(x="omega", dir ="C:/rtest/distr/branches/distr-2.7/pkg/distrMod/", rec=TRUE)
 
 #finde(x="getPos", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE)
-finde(x="\\.rd", dir ="C:/rtest/distr/pkg/distrEllipse/R")
-finde(x="RobExtremes", dir ="C:/rtest/distr/pkg/distrMod/man")
-finde(x="getFromNamespace", dir ="C:/rtest/robast/branches/robast-1.0/pkg/RobAStBase/",rec=TRUE)
-
-finde(x="getFiRisk", dir ="C:/rtest/robast/pkg/RobAStBase/",rec=TRUE)
-finde(x="\\.LowerCaseMultivariateTV", dir ="C:/rtest/robast/branches/robast-1.0/pkg/RobAStBase/R")
-finde(x="\\.checkEstClassForParamFamily", dir ="C:/rtest/distr/pkg/distrMod/R")
-finde(x="\\.cexscale", dir ="C:/rtest/robast/branches/robast-1.1/pkg/RobAStBase", rec=TRUE)
-finde(x="updatePackageHelp", dir ="C:/rtest/distr/pkg/utils", rec=TRUE)
 finde(x="roptest\\(", dir ="C:/rtest/robast/branches/robast-0.9/pkg/ROptEst/", rec=TRUE)
 finde(x="getSlots\\(", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrMod/", rec=TRUE)
 finde(x="\"loc\"", dir ="C:/rtest/distr/branches/distr-2.4/pkg/distrEx/", rec=TRUE)
@@ -62,5 +56,8 @@
   }
 infind(dir)
 }
+ersetze(x0="https://distr.r-forge.r-project.org/",x1="http://distr.r-forge.r-project.org/", dir ="C:/rtest/distr/branches/distr-2.7/pkg", rec=TRUE,ext="Rd")
+
 ersetze(x0="href=\"distr.pdf\"",x1="href=\"http://cran.r-project.org/web/packages/distrDoc/vignettes/distr.pdf\"", dir ="C:/rtest/distr/www", rec=TRUE,ext="html")
 ersetze(x0="peter.ruckdeschel at uni-bayreuth.de",x1="peter.ruckdeschel at uni-oldenburg.de", dir ="C:/rtest/distr/www", rec=TRUE, ext="html")
+ersetze(x0="peter.ruckdeschel at itwm.fraunhofer.de", x1="peter.ruckdeschel at uni-oldenburg.de", dir ="C:/rtest/robast/branches/robast-1.1", rec=TRUE, ext="Rd")



More information about the Distr-commits mailing list