Permalink
Browse files

remove support for win64.binary repositories

git-svn-id: https://svn.r-project.org/R/trunk@53231 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 0f7c4da commit 45a8f71de66017e950668639069a11bdf99e2a5d ripley committed Oct 8, 2010
View
@@ -50,7 +50,7 @@
}
}
-\section{CHANGES IN R VERSION 2.12.0 PATCHED}{
+\section{CHANGES IN R VERSION 2.12.0 patched}{
\subsection{BUG FIXES}{
\itemize{
\item \code{seq.int} no longer sometimes evaluates arguments
View
@@ -1873,12 +1873,6 @@ can be used, e.g.@: @file{.tar.bz2} or @file{.tar.xz} files.
@R{} versions @var{x.y.z} and containing @file{.zip} files for Windows.
@item
-@code{"win64.binary"}: located at @file{bin/windows64/contrib/@var{x.y}}
-for @R{} versions @var{x.y.z} and containing @file{.zip} files for
-64-bit Windows. (This was used for @R{} 2.11.x, but is no longer the
-default for 64-bit Windows.)
-
-@item
@code{"mac.binary"}: located at
@file{bin/macosx/universal/contrib/@var{x.y}} for @R{} versions @var{x.y.z}
and containing @file{.tgz} files. If the repository contains only
View
@@ -8,12 +8,12 @@
## BioC version associated with the current R version.
## Also, %bm is substituted from the setting of getOption("BioC_mirror")
##
-menu_name URL default source win.binary mac.binary win64.binary
-CRAN CRAN @CRAN@ TRUE TRUE TRUE TRUE FALSE
-CRANextra CRAN (extras) "http://www.stats.ox.ac.uk/pub/RWin" TRUE FALSE TRUE TRUE FALSE
-Omegahat Omegahat http://www.omegahat.org/R FALSE TRUE TRUE FALSE FALSE
-BioCsoft "BioC software" %bm/packages/%v/bioc FALSE TRUE TRUE TRUE FALSE
-BioCann "BioC annotation" %bm/packages/%v/data/annotation FALSE TRUE TRUE TRUE FALSE
-BioCexp "BioC experiment" %bm/packages/%v/data/experiment FALSE TRUE TRUE TRUE FALSE
-BioCextra "BioC extra" %bm/packages/%v/extra FALSE TRUE TRUE TRUE FALSE
-R-Forge R-Forge http://R-Forge.R-project.org FALSE TRUE TRUE TRUE FALSE
+menu_name URL default source win.binary mac.binary
+CRAN CRAN @CRAN@ TRUE TRUE TRUE TRUE
+CRANextra CRAN (extras) "http://www.stats.ox.ac.uk/pub/RWin" TRUE FALSE TRUE TRUE
+Omegahat Omegahat http://www.omegahat.org/R FALSE TRUE TRUE FALSE
+BioCsoft "BioC software" %bm/packages/%v/bioc FALSE TRUE TRUE TRUE
+BioCann "BioC annotation" %bm/packages/%v/data/annotation FALSE TRUE TRUE TRUE
+BioCexp "BioC experiment" %bm/packages/%v/data/experiment FALSE TRUE TRUE TRUE
+BioCextra "BioC extra" %bm/packages/%v/extra FALSE TRUE TRUE TRUE
+R-Forge R-Forge http://R-Forge.R-project.org FALSE TRUE TRUE TRUE
View
@@ -11,6 +11,9 @@
removes BOMs when reading and adds them when writing. (This is
consistent with MicroSoft applications, but Unix versions of
\code{iconv} usually ignore them.)
+
+ \item Support for repository type \samp{win64.binary} (used for
+ 64-bit Windows binaries for \R 2.11.x) has been removed.
}
}
}
@@ -1200,9 +1200,7 @@ function(file)
db <- utils::read.delim(file, header = TRUE, comment.char = "#",
colClasses =
c(rep.int("character", 3L),
- rep.int("logical", 4L)))
- if("win64.binary" %in% names(db))
- db[["win64.binary"]] <- as.logical(db[["win64.binary"]])
+ rep.int("logical", 4L))) # allow for win64.binary
db[, "URL"] <- .expand_BioC_repository_URLs(db[, "URL"])
db
}
@@ -581,8 +581,7 @@ download.packages <- function(pkgs, destdir, available = NULL,
switch(type,
"source" = ".tar.gz",
"mac.binary" = ".tgz",
- "win.binary" = ".zip",
- "win64.binary" = ".zip"),
+ "win.binary" = ".zip"),
sep = "")
have_fn <- !is.na(File)
fn[have_fn] <- File[have_fn]
@@ -651,8 +650,7 @@ contrib.url <- function(repos, type = getOption("pkgType"))
res <- switch(type,
"source" = paste(gsub("/$", "", repos), "src", "contrib", sep="/"),
"mac.binary" = paste(gsub("/$", "", repos), "bin", "macosx", mac.subtype, "contrib", ver, sep = "/"),
- "win.binary" = paste(gsub("/$", "", repos), "bin", "windows", "contrib", ver, sep="/"),
- "win64.binary" = paste(gsub("/$", "", repos), "bin", "windows64", "contrib", ver, sep="/")
+ "win.binary" = paste(gsub("/$", "", repos), "bin", "windows", "contrib", ver, sep="/")
)
res
}
@@ -241,8 +241,7 @@ install.packages <-
## check if we should infer repos=NULL
if(length(pkgs) == 1L && missing(repos) && missing(contriburl)) {
if((type == "source" && length(grep("\\.tar.gz$", pkgs))) ||
- (type %in% c("win.binary", "win64.binary")
- && length(grep("\\.zip$", pkgs))) ||
+ (type %in% "win.binary" && length(grep("\\.zip$", pkgs))) ||
(substr(type, 1L, 10L) == "mac.binary"
&& length(grep("\\.tgz$", pkgs)))) {
repos <- NULL
@@ -255,7 +254,7 @@ install.packages <-
if(type == "mac.binary")
stop("cannot install MacOS X binary packages on Windows")
- if(type %in% c("win.binary", "win64.binary")) {
+ if(type %in% "win.binary") {
## include local .zip files
.install.winbinary(pkgs = pkgs, lib = lib, contriburl = contriburl,
method = method, available = available,
@@ -287,7 +286,7 @@ install.packages <-
return(invisible())
}
- if(type %in% c("win.binary", "win64.binary"))
+ if(type %in% "win.binary")
stop("cannot install Windows binary packages on this plaform")
if(!file.exists(file.path(R.home("bin"), "INSTALL")))
@@ -92,9 +92,9 @@ install.packages(pkgs, lib, repos = getOption("repos"),
install.
Possible values are \code{"source"}, \code{"mac.binary"},
- \code{"mac.binary.leopard"}, \code{"win.binary"} and
- \code{"win64.binary"}: the binary types can be listed and downloaded
- but not installed on other platforms.
+ \code{"mac.binary.leopard"} and \code{"win.binary"}: the binary
+ types can be listed and downloaded but not installed on other
+ platforms.
The default is the appropriate binary type on Windows and on
the CRAN binary Mac OS X distribution, otherwise \code{"source"}.

0 comments on commit 45a8f71

Please sign in to comment.