Use rtools curl when available

jeroen · Aug 23, 2024 · 993009e · 993009e
1 parent 09f8c46
commit 993009e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -26,11 +26,16 @@ jobs:
           - {os: macOS-13,   r: 'release', ssl-backend: SecureTransport}
           - {os: macOS-14,   r: 'release'}
           - {os: macOS-14,   r: 'release', ssl-backend: SecureTransport}
-          - {os: windows-latest, r: 'release', ssl-backend: openssl}
-          - {os: windows-latest, r: 'release'}
+          - {os: windows-latest, r: 'devel'}
+          - {os: windows-latest, r: 'devel', ssl-backend: openssl}
+          - {os: windows-latest, r: '4.4'}
+          - {os: windows-latest, r: '4.4', ssl-backend: openssl}
+          - {os: windows-latest, r: '4.3'}
+          - {os: windows-latest, r: '4.3', ssl-backend: openssl}
           - {os: windows-latest, r: '4.2'}
           - {os: windows-latest, r: '4.1', ssl-backend: openssl}
           - {os: windows-latest, r: '4.1'}
+          - {os: windows-latest, r: '4.0'}
           - {os: windows-latest, r: '3.6'}
           - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest, r: 'release'}

diff --git a/R/options.R b/R/options.R
@@ -29,7 +29,7 @@ option_table <- (function(){
   } else if(file.exists("../tools/option_table.txt")){
     source("../tools/option_table.txt", env)
   } else {
-    stop("Failed to find 'tools/option_table.txt' from:", getwd())
+    return(NULL)
   }
 
   option_table <- unlist(as.list(env))

diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
@@ -0,0 +1,8 @@
+# Fallback for older rtools without
+PKG_LIBS_CURL = $(shell pkg-config --libs libcurl)
+ifeq (,$(PKG_LIBS_CURL))
+  include Makevars.win
+else
+  PKG_LIBS = $(PKG_LIBS_CURL) -lwinhttp
+  PKG_CPPFLAGS = $(shell pkg-config --cflags libcurl) -DCURL_STATICLIB -DSTRICT_R_HEADERS -DR_NO_REMAP
+endif