enable support for binary packages for custom builds

urbaneks · urbaneks · commit ea76baea8bbd · 2026-02-03T01:18:03.000Z
git-svn-id: https://svn.r-project.org/R/trunk@89370 00db46b3-68df-0310-9c12-caf00c1e9a41
diff --git a/src/library/tools/R/packages.R b/src/library/tools/R/packages.R
@@ -17,16 +17,33 @@
 #  https://www.R-project.org/Licenses/
 
 write_PACKAGES <-
-function(dir = ".", fields = NULL,
-         type = c("source", "mac.binary", "win.binary"),
+function(dir = ".", fields = NULL, type,
          verbose = FALSE, unpacked = FALSE, subdirs = FALSE,
-         latestOnly = TRUE, addFiles = FALSE, rds_compress = "xz",
+         latestOnly = TRUE, addFiles = grepl("binary", type), rds_compress = "xz",
          validate = FALSE)
 {
-    if(missing(type) && .Platform$OS.type == "windows")
-        type <- "win.binary"
-    type <- match.arg(type)
-
+    ## FIXME: IMHO this should be either .Platform$pkgType or "source"
+    ## I don't like the Windows-only exception, but is it too late to change it?
+    if(missing(type))
+        type <- if (.Platform$OS.type == "windows") "win.binary" else "source"
+    if (type == "binary") {
+        if (.Platform$pkgType == "source")
+            stop("There is no binary type for this build of R.")
+        type <- .Platform$pkgType
+    }
+    if (grepl(".binary", type, fixed=TRUE)) {
+        ## strip build name
+        type <- gsub("^([[:lower:]]+[.]binary)[.].*", "\\1", type)
+        ## at this point we only care about win, mac or other
+        if (! type %in% c("win.binary", "mac.binary"))
+            type <- "other.binary"
+    } else {
+        ## for compatibility with R < 4.6.0 we handle partial matching
+        ## of c("source", "win.binary", "mac.binary") as it was using match.arg
+        choices <- c("source", "win.binary", "mac.binary")
+        type <- choices[pmatch(type, choices)]
+        if (any(is.na(type))) stop("invalid 'type'")
+    }
     paths <- ""
     if(is.logical(subdirs) && subdirs) {
         owd <- setwd(dir)
@@ -113,7 +130,7 @@ function(desc, path, addFiles, addPaths, latestOnly)
 
 ## factored out so it can be used in multiple
 ## places without threat of divergence
-.get_pkg_file_pattern = function(type = c("source", "mac.binary", "win.binary"),
+.get_pkg_file_pattern = function(type = c("source", "mac.binary", "win.binary", "other.binary"),
                                  ext.only = FALSE)
 {
 
@@ -124,7 +141,9 @@ function(desc, path, addFiles, addPaths, latestOnly)
     ret = switch(type,
                  "source" = "_.*\\.tar\\.[^_]*$",
                  "mac.binary" = "_.*\\.tgz$",
-                 "win.binary" = "_.*\\.zip$")
+                 "win.binary" = "_.*\\.zip$",
+                 "other.binary" = "_.*\\.tar\\.[^_]*$" ##  we assume any custom binaries are still tar balls
+                 )
     if(ext.only)
         ret = gsub("_.*", "", fixed = TRUE, ret)
     ret
@@ -133,7 +152,7 @@ function(desc, path, addFiles, addPaths, latestOnly)
 ## what you add.
 .build_repository_package_db <-
 function(dir, fields = NULL,
-         type = c("source", "mac.binary", "win.binary"),
+         type = c("source", "mac.binary", "win.binary", "other.binary"),
          verbose = getOption("verbose"),
          unpacked = FALSE, validate = FALSE)
 {
diff --git a/src/library/tools/R/utils.R b/src/library/tools/R/utils.R
@@ -1408,7 +1408,7 @@ function()
 ### ** .get_standard_repository_db_fields
 
 .get_standard_repository_db_fields <-
-function(type = c("source", "mac.binary", "win.binary")) {
+function(type = c("source", "mac.binary", "win.binary", "other.binary")) {
     type <- match.arg(type)
     c("Package", "Version", "Priority",
       "Depends", "Imports", "LinkingTo", "Suggests", "Enhances",
diff --git a/src/library/tools/man/writePACKAGES.Rd b/src/library/tools/man/writePACKAGES.Rd
@@ -11,11 +11,10 @@
   files for a repository of source or Mac/Windows binary packages.
 }
 \usage{
-write_PACKAGES(dir = ".", fields = NULL,
-               type = c("source", "mac.binary", "win.binary"),
+write_PACKAGES(dir = ".", fields = NULL, type,
                verbose = FALSE, unpacked = FALSE, subdirs = FALSE,
-               latestOnly = TRUE, addFiles = FALSE, rds_compress = "xz",
-               validate = FALSE)
+               latestOnly = TRUE, addFiles = grepl("binary", type),
+               rds_compress = "xz", validate = FALSE)
 }
 \arguments{
   \item{dir}{Character vector describing the location of the repository
@@ -40,9 +39,18 @@ write_PACKAGES(dir = ".", fields = NULL,
     are used.
   }
   \item{type}{
-    Type of packages: currently source \file{.tar.\{gz,bz2,xz,zstd\}} archives,
-    and macOS or Windows binary (\file{.tgz} or \file{.zip},
-    respectively) packages are supported.  Defaults to
+    Type of packages. It can be either \code{"source"} or the name of
+    the binary type (e.g., \code{"win.binary"} or
+    \code{"mac.binary.big-sur-x86_64"}). In addition, the value
+    \code{"binary"} corresponds to default binary type for this R build
+    (see \code{.Platform$pkgType}).
+    In R versions before 4.6.0 this argument was partially matched to
+    the choices \code{"source"}, \code{"mac.binary"} and \code{"win.binary"}
+    which is still honored, but the partial matching is now deprecated
+    to better support other binary types.
+    Currently, source and custom binary \file{.tar.\{gz,bz2,xz,zstd\}}
+    archives, legacy macOS or Windows binary (\file{.tgz} or
+    \file{.zip}, respectively) packages are supported. Defaults to
     \code{"win.binary"} on Windows and to \code{"source"} otherwise.
   }
   \item{verbose}{logical.  Should packages be listed as they are
diff --git a/src/library/utils/R/packages.R b/src/library/utils/R/packages.R
@@ -819,15 +819,18 @@ download.packages <- function(pkgs, destdir, available = NULL,
                 keep[duplicated(keep)] <- FALSE
                 ok[ok][!keep] <- FALSE
             }
-            if (startsWith(type, "mac.binary")) type <- "mac.binary"
             ## in Oct 2009 we introduced file names in PACKAGES files
             File <- available[ok, "File"]
+            ## strip build name for ext detection
+            type <- gsub("^([[:lower:]]+[.]binary)[.].*", "\\1", type)
+            ## this is just a fall-back if there is no File: so hopefully
+            ## no longer used
             fn <- paste0(p, "_", available[ok, "Version"],
                          switch(type,
                                 "source" = ".tar.gz",
                                 "mac.binary" = ".tgz",
                                 "win.binary" = ".zip",
-                                stop("invalid 'type'")))
+                                ".tar.xz")) ## for any other binaries, but they should use File:
             have_fn <- !is.na(File)
             fn[have_fn] <- File[have_fn]
             repos <- available[ok, "Repository"]
@@ -1050,7 +1053,8 @@ setRepositories <-
         stop("invalid options(\"pkgType\"); must be a character string")
     if (pkgType == "both") pkgType <- "source" #.Platform$pkgType
     if (pkgType == "binary") pkgType <- .Platform$pkgType
-    if(startsWith(pkgType, "mac.binary")) pkgType <- "mac.binary"
+    ## strip build names (until we need them and start recording them)
+    pkgType <- gsub("^([[:lower:]]+[.]binary)[.].*", "\\1", pkgType)
     thisType <- a[[pkgType]]
     a <- a[thisType, 1L:3L]
     repos <- getOption("repos")
diff --git a/src/library/utils/R/packages2.R b/src/library/utils/R/packages2.R
@@ -16,6 +16,7 @@
 #  A copy of the GNU General Public License is available at
 #  https://www.R-project.org/Licenses/
 
+## FIXME: at some point we may want to allow custom binary installs on Windows as well
 if (.Platform$OS.type == "windows")
     .install.macbinary <- function(...) NULL	# globalVariables isn't available, so use this to suppress the warning
 
@@ -194,7 +195,7 @@ install.packages <-
     get_package_name <- function(pkg) {
         ## Since the pkg argument can be the name of a file rather than
         ## a regular package name, we have to clean that up.
-        gsub("_[.](zip|tar[.](gz|bzip2|bz2|xz|zstd|xst))", "",
+        gsub("_[.](zip|tar[.](gz|bzip2|bz2|xz|zstd|zst))", "",
              gsub(.standard_regexps()$valid_package_version, "",
                   basename(pkg)))
     }
@@ -350,9 +351,10 @@ install.packages <-
 
     ## check if we should infer repos = NULL
     if(length(pkgs) == 1L && missing(repos) && missing(contriburl)) {
-        if((type == "source" && any(grepl("[.]tar[.](gz|bz2|xz)$", pkgs))) ||
+        if((type == "source" && any(grepl("[.]tar[.](gz|bz2|xz|zstd|zst)$", pkgs))) ||
            (type %in% "win.binary" && endsWith(pkgs, ".zip")) ||
-           (startsWith(type, "mac.binary") && endsWith(pkgs, ".tgz"))) {
+           (startsWith(type, "mac.binary") && endsWith(pkgs, ".tgz")) ||
+           (grepl("[.]binary", type) &&  any(grepl("[.]tar[.](gz|bz2|xz|zstd|zst)$", pkgs)))) {
             repos <- NULL
             message("inferring 'repos = NULL' from 'pkgs'")
         }
@@ -366,8 +368,10 @@ install.packages <-
                 repos <- NULL
                 type <- type2
                 message("inferring 'repos = NULL' from 'pkgs'")
-            } else if (grepl("[.]tar[.](gz|bz2|xz)$", pkgs)) {
+            } else if (grepl("[.]tar[.](gz|bz2|xz|zstd|zst)$", pkgs)) {
                 repos <- NULL
+                ## can be either source or custom binary, but source falls back to
+                ## R CMD INSTALL which can handle both, so choose "source" to be safe
                 type <- "source"
                 message("inferring 'repos = NULL' from 'pkgs'")
            }
@@ -380,7 +384,7 @@ install.packages <-
 	    ||(startsWith(type2, "mac.binary")
 		   && endsWith(pkgs, ".tgz"))) {
 	    type <- type2
-	} else if (grepl("[.]tar[.](gz|bz2|xz)$", pkgs)) {
+	} else if (grepl("[.]tar[.](gz|bz2|xz|zstd|zst)$", pkgs)) {
 	    type <- "source"
        }
     }
@@ -550,7 +554,7 @@ install.packages <-
         }
 
         if(length(bins)) {
-            if(type2 == "win.binary")
+            if(startsWith(type2, "win.binary"))
                 .install.winbinary(pkgs = bins, lib = lib,
                                    contriburl = contrib.url(repos, type2),
                                    method = method, available = av2,
@@ -576,7 +580,7 @@ install.packages <-
 	flush.console()
         ## end of "both"
     } else if (getOption("install.packages.check.source", "yes") %in% "yes"
-               && (type %in% "win.binary" || startsWith(type, "mac.binary"))) {
+               && (grepl("^[[:lower::]]+[.]binary", type))) {
         if (missing(contriburl) && is.null(available) && !is.null(repos)) {
             contriburl2 <- contrib.url(repos, "source")
 	    # The line above may have changed the repos option, so..
@@ -630,10 +634,11 @@ install.packages <-
     }
 
     if(.Platform$OS.type == "windows") {
-        if(startsWith(type, "mac.binary"))
-            stop("cannot install macOS binary packages on Windows")
+        ## FIXME: we may want allow custom binaries on Windows as well...
+        if(!startsWith(type, "win.binary") && type != "source")
+            stop("cannot install binary packages from other operating systems on Windows")
 
-        if(type %in% "win.binary") {
+        if(startsWith(type, "win.binary")) {
             ## include local .zip files
             .install.winbinary(pkgs = pkgs, lib = lib, contriburl = contriburl,
                                method = method, available = available,
@@ -655,19 +660,17 @@ install.packages <-
         ## -- will mess up UNC names, but they don't work
         pkgs <- gsub("\\", "/", pkgs, fixed=TRUE)
     } else {
-        if(startsWith(type, "mac.binary")) {
-            if(!grepl("darwin", R.version$platform))
-                stop("cannot install macOS binary packages on this platform")
+        if(startsWith(type, "win.binary"))
+            stop("cannot install Windows binary packages on this platform")
+
+        if(grepl("^[[:lower:]]+[.]binary", type)) {
             .install.macbinary(pkgs = pkgs, lib = lib, contriburl = contriburl,
                                method = method, available = available,
                                destdir = destdir,
                                dependencies = dependencies, quiet = quiet, ...)
             return(invisible())
         }
 
-        if(type %in% "win.binary")
-            stop("cannot install Windows binary packages on this platform")
-
         if(!file.exists(file.path(R.home("bin"), "INSTALL")))
             stop("This version of R is not set up to install source packages\nIf it was installed from an RPM, you may need the R-devel RPM")
     }
diff --git a/src/library/utils/R/unix/mac.install.R b/src/library/utils/R/unix/mac.install.R
@@ -1,7 +1,7 @@
 #  File src/library/utils/R/unix/mac.install.R
 #  Part of the R package, https://www.R-project.org
 #
-#  Copyright (C) 1995-2017 The R Core Team
+#  Copyright (C) 1995-2025 The R Core Team
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,27 +17,16 @@
 #  https://www.R-project.org/Licenses/
 
 
-if(!startsWith(R.version$os, "darwin")) {
 .install.macbinary <-
     function(pkgs, lib, repos = getOption("repos"),
-             contriburl = contrib.url(repos, type="mac.binary"),
-             method, available = NULL, destdir = NULL,
-             dependencies = FALSE,
-             lock = getOption("install.lock", FALSE), quiet = FALSE,
-             ...)
-    {}
-} else {
-## edited from windows/.install.winbinary
-##
-.install.macbinary <-
-    function(pkgs, lib, repos = getOption("repos"),
-             contriburl = contrib.url(repos, type="mac.binary"),
+             contriburl = contrib.url(repos, type=type),
              method, available = NULL, destdir = NULL,
              dependencies = FALSE,
              lock = getOption("install.lock", FALSE), quiet = FALSE,
+             type = .Platform$pkgType,
              ...)
 {
-    untar <- function(what, where)
+    untar0 <- function(what, where)
     {
         ## FIXME: should this look for Sys.getenv('TAR')?
         ## Leopard has GNU tar, SL has BSD tar.
@@ -48,6 +37,9 @@ if(!startsWith(R.version$os, "darwin")) {
                     domain = NA, call. = FALSE)
     }
 
+    ## not sure why the above was used - possibly it pre-dates utils::untar()?
+    untar <- function(what, where) utils::untar(what, exdir=where)
+
     unpackPkg <- function(pkg, pkgname, lib, lock = FALSE)
     {
         ## Create a temporary directory and unpack the zip to it
@@ -64,15 +56,15 @@ if(!startsWith(R.version$os, "darwin")) {
         setwd(tmpDir)
         ## sanity check: people have tried to install source .tgz files
         if (!file.exists(file <- file.path(pkgname, "Meta", "package.rds")))
-            stop(gettextf("file %s is not a macOS binary package", sQuote(pkg)),
+            stop(gettextf("file %s is not a binary package", sQuote(pkg)),
                  domain = NA, call. = FALSE)
         desc <- readRDS(file)$DESCRIPTION
         if (length(desc) < 1L)
-            stop(gettextf("file %s is not a macOS binary package", sQuote(pkg)),
+            stop(gettextf("file %s is not a binary package", sQuote(pkg)),
                  domain = NA, call. = FALSE)
         desc <- as.list(desc)
         if (is.null(desc$Built))
-            stop(gettextf("file %s is not a macOS binary package", sQuote(pkg)),
+            stop(gettextf("file %s is not a binary package", sQuote(pkg)),
                  domain = NA, call. = FALSE)
 
         res <- tools::checkMD5sums(pkgname, file.path(tmpDir, pkgname))
@@ -137,7 +129,7 @@ if(!startsWith(R.version$os, "darwin")) {
     if(is.null(contriburl)) {
         pkgnames <- basename(pkgs)
         pkgnames <- sub("\\.tgz$", "", pkgnames)
-        pkgnames <- sub("\\.tar\\.gz$", "", pkgnames)
+        pkgnames <- sub("\\.tar\\.(gz|bzip2|bz2|xz|zstd|zst)$", "", pkgnames)
         pkgnames <- sub("_.*$", "", pkgnames)
         ## there is no guarantee we have got the package name right:
         ## foo.zip might contain package bar or Foo or FOO or ....
@@ -160,12 +152,12 @@ if(!startsWith(R.version$os, "darwin")) {
 
     if(is.null(available))
         available <- available.packages(contriburl = contriburl,
-                                        method = method, ...)
+                                        method = method, type = type, ...)
     pkgs <- getDependencies(pkgs, dependencies, available, lib, binary = TRUE)
 
     foundpkgs <- download.packages(pkgs, destdir = tmpd, available = available,
                                    contriburl = contriburl, method = method,
-                                   type = "mac.binary", quiet = quiet, ...)
+                                   type = type, quiet = quiet, ...)
 
     if(length(foundpkgs)) {
         update <- unique(cbind(pkgs, lib))
@@ -187,4 +179,3 @@ if(!startsWith(R.version$os, "darwin")) {
 
     invisible()
 }
-}
