Use Rtools45 instead of Rtools44 in installer build on Windows.

git-svn-id: https://svn.r-project.org/R/trunk@87995 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: kalibera

src/gnuwin32/fixed/etc/Makeconf

@@ -45,13 +45,13 @@ ifeq ($(R_INSTALLER_BUILD), yes)
   ifneq ($(strip $(R_CUSTOM_TOOLS_SOFT)),)
     LOCAL_SOFT = $(R_CUSTOM_TOOLS_SOFT)
   else
-    ## The rtools44 installer sets RTOOLS44_HOME (or RTOOLS44_AARCH64_HOME)
+    ## The rtools45 installer sets RTOOLS45_HOME (or RTOOLS45_AARCH64_HOME)
 
-    # INSTALLER-BUILD-x86_64: RTOOLS44_HOME ?= c:/rtools44
-    # INSTALLER-BUILD-x86_64: LOCAL_SOFT = $(subst \,/,$(RTOOLS44_HOME))/x86_64-w64-mingw32.static.posix
+    # INSTALLER-BUILD-x86_64: RTOOLS45_HOME ?= c:/rtools45
+    # INSTALLER-BUILD-x86_64: LOCAL_SOFT = $(subst \,/,$(RTOOLS45_HOME))/x86_64-w64-mingw32.static.posix
 
-    # INSTALLER-BUILD-aarch64: RTOOLS44_HOME ?= c:/rtools44-aarch64
-    # INSTALLER-BUILD-aarch64: LOCAL_SOFT = $(subst \,/,$(RTOOLS44_AARCH64_HOME))/aarch64-w64-mingw32.static.posix
+    # INSTALLER-BUILD-aarch64: RTOOLS45_HOME ?= c:/rtools45-aarch64
+    # INSTALLER-BUILD-aarch64: LOCAL_SOFT = $(subst \,/,$(RTOOLS45_AARCH64_HOME))/aarch64-w64-mingw32.static.posix
   endif
 endif
 R_TOOLS_SOFT ?= $(LOCAL_SOFT)

src/gnuwin32/fixed/etc/Rcmd_environ

@@ -36,8 +36,8 @@ R_BZIPCMD=${R_BZIPCMD-'bzip2'}
 SED=${SED-sed}
 
 ## keep in step with Rprofile.windows
-# INSTALLER-BUILD-x86_64:R_RTOOLS44_PATH="${RTOOLS44_HOME:-c:/rtools44}/x86_64-w64-mingw32.static.posix/bin;${RTOOLS44_HOME:-c:/rtools44}/usr/bin"
-# INSTALLER-BUILD-aarch64:R_RTOOLS44_PATH="${RTOOLS44_AARCH64_HOME:-c:/rtools44-aarch64}/aarch64-w64-mingw32.static.posix/bin;${RTOOLS44_AARCH64_HOME:-c:/rtools44-aarch64}/usr/bin"
+# INSTALLER-BUILD-x86_64:R_RTOOLS45_PATH="${RTOOLS45_HOME:-c:/rtools45}/x86_64-w64-mingw32.static.posix/bin;${RTOOLS45_HOME:-c:/rtools45}/usr/bin"
+# INSTALLER-BUILD-aarch64:R_RTOOLS45_PATH="${RTOOLS45_AARCH64_HOME:-c:/rtools45-aarch64}/aarch64-w64-mingw32.static.posix/bin;${RTOOLS45_AARCH64_HOME:-c:/rtools45-aarch64}/usr/bin"
 #   trailing slash to protect against trailing backslash in PATH
-# INSTALLER-BUILD:PATH="${R_CUSTOM_TOOLS_PATH:-${R_RTOOLS44_PATH}};${PATH}/"
+# INSTALLER-BUILD:PATH="${R_CUSTOM_TOOLS_PATH:-${R_RTOOLS45_PATH}};${PATH}/"
 

src/library/profile/Rprofile.windows

@@ -63,25 +63,25 @@ local({
 
 local({
     # keep in step with Rcmd_environ
-    setRtools44Path <- 0
-    # INSTALLER-BUILD: setRtools44Path <- 1
+    setRtools45Path <- 0
+    # INSTALLER-BUILD: setRtools45Path <- 1
 
-    if (setRtools44Path) {
+    if (setRtools45Path) {
         aarch64 <- FALSE
         # INSTALLER-BUILD-aarch64: aarch64 <- TRUE
 
         if (aarch64) {
-            rthome <- Sys.getenv("RTOOLS44_AARCH64_HOME",
-                                 "c:/rtools44-aarch64")
+            rthome <- Sys.getenv("RTOOLS45_AARCH64_HOME",
+                                 "c:/rtools45-aarch64")
             rtpath <- paste0(rthome, "/aarch64-w64-mingw32.static.posix/bin;",
                              rthome, "/usr/bin")
         } else {
-            rthome <- Sys.getenv("RTOOLS44_HOME", "c:/rtools44")
+            rthome <- Sys.getenv("RTOOLS45_HOME", "c:/rtools45")
             rtpath <- paste0(rthome, "/x86_64-w64-mingw32.static.posix/bin;",
                              rthome, "/usr/bin")
         }
         path <- Sys.getenv("R_CUSTOM_TOOLS_PATH", rtpath)
-        Sys.setenv(R_RTOOLS44_PATH = rtpath)
+        Sys.setenv(R_RTOOLS45_PATH = rtpath)
         Sys.setenv(PATH = paste0(path, ";", Sys.getenv("PATH")))
     }
 })