From d7bd290423f1e7ed83607ae9d82c642a74774a79 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sat, 1 Aug 2026 15:52:48 -0500 Subject: [PATCH 1/5] On windows-arm64, use Makevars.no_blp for 'empty' build --- .Rbuildignore | 1 + configure.win | 5 +++++ src/{Makevars.win => Makevars.win.in} | 0 tools/configureWin.R | 9 +++++++++ 4 files changed, 15 insertions(+) create mode 100644 configure.win rename src/{Makevars.win => Makevars.win.in} (100%) create mode 100644 tools/configureWin.R diff --git a/.Rbuildignore b/.Rbuildignore index b84b34e..f5e3ca3 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -6,6 +6,7 @@ ^blp ^inst/blp src/Makevars$ +src/Makevars.win$ ^\.Rhistory ^.*\.tar\.gz$ ^\.github diff --git a/configure.win b/configure.win new file mode 100644 index 0000000..5d5df2d --- /dev/null +++ b/configure.win @@ -0,0 +1,5 @@ +#!/bin/sh + +: ${R_HOME:=`R RHOME`} + +${R_HOME}/bin/Rscript tools/configureWin.R diff --git a/src/Makevars.win b/src/Makevars.win.in similarity index 100% rename from src/Makevars.win rename to src/Makevars.win.in diff --git a/tools/configureWin.R b/tools/configureWin.R new file mode 100644 index 0000000..6994142 --- /dev/null +++ b/tools/configureWin.R @@ -0,0 +1,9 @@ + +## See e.g. github package 'eddelbuettel/tellme' at r-universe for output on +## various platform; there we aim at windows-arm64 for which we have Blp library +if (R.version$platform == "aarch64" && R.version$os == "mingw32") { + file.copy("src/Makevars.no_nlp", "src/Makevars.win") +} else { + file.copy("src/Makevars.win.in", "src/Makevars.win") + +} From 233b4adf49965cea0a6264fe7f546e03b5ea7c6c Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sat, 1 Aug 2026 18:03:24 -0500 Subject: [PATCH 2/5] A little more debugging --- configure.win | 1 + tools/configureWin.R | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.win b/configure.win index 5d5df2d..473238f 100644 --- a/configure.win +++ b/configure.win @@ -2,4 +2,5 @@ : ${R_HOME:=`R RHOME`} +echo "+++ hello from configure.win" ${R_HOME}/bin/Rscript tools/configureWin.R diff --git a/tools/configureWin.R b/tools/configureWin.R index 6994142..c4a6b49 100644 --- a/tools/configureWin.R +++ b/tools/configureWin.R @@ -1,9 +1,9 @@ ## See e.g. github package 'eddelbuettel/tellme' at r-universe for output on ## various platform; there we aim at windows-arm64 for which we have Blp library +cat("+++ hello from configureWin.R\n") if (R.version$platform == "aarch64" && R.version$os == "mingw32") { file.copy("src/Makevars.no_nlp", "src/Makevars.win") } else { file.copy("src/Makevars.win.in", "src/Makevars.win") - } From 2ca22a3fdeb0934bb791b9bd2947618e6d2b3970 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sat, 1 Aug 2026 18:58:05 -0500 Subject: [PATCH 3/5] A little more debugging (2) --- tools/configureWin.R | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/configureWin.R b/tools/configureWin.R index c4a6b49..bb41ef3 100644 --- a/tools/configureWin.R +++ b/tools/configureWin.R @@ -2,8 +2,11 @@ ## See e.g. github package 'eddelbuettel/tellme' at r-universe for output on ## various platform; there we aim at windows-arm64 for which we have Blp library cat("+++ hello from configureWin.R\n") +print(R.version) if (R.version$platform == "aarch64" && R.version$os == "mingw32") { - file.copy("src/Makevars.no_nlp", "src/Makevars.win") + cat("+++ hello from configureWin.R -- aarch/arm64\n") + rc <- file.copy("src/Makevars.no_nlp", "src/Makevars.win") } else { - file.copy("src/Makevars.win.in", "src/Makevars.win") + cat("+++ hello from configureWin.R -- amd64\n") + rc <- file.copy("src/Makevars.win.in", "src/Makevars.win") } From e841474ca24dc720c4fa1443eadaee5e4fe5a61d Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sat, 1 Aug 2026 20:28:40 -0500 Subject: [PATCH 4/5] Correct comparison variable --- tools/configureWin.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/configureWin.R b/tools/configureWin.R index bb41ef3..0367bac 100644 --- a/tools/configureWin.R +++ b/tools/configureWin.R @@ -3,7 +3,7 @@ ## various platform; there we aim at windows-arm64 for which we have Blp library cat("+++ hello from configureWin.R\n") print(R.version) -if (R.version$platform == "aarch64" && R.version$os == "mingw32") { +if (R.version$arch == "aarch64" && R.version$os == "mingw32") { cat("+++ hello from configureWin.R -- aarch/arm64\n") rc <- file.copy("src/Makevars.no_nlp", "src/Makevars.win") } else { From 915f0a739abb5bb003a07ed1d058201267901a00 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sun, 2 Aug 2026 06:49:02 -0500 Subject: [PATCH 5/5] Simplify --- configure | 2 +- configure.win | 1 - tools/configureWin.R | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/configure b/configure index bd6c5fc..1a2214a 100755 --- a/configure +++ b/configure @@ -3,7 +3,7 @@ ## ## configure -- Unix build preparation system ## -## Copyright (C) 2015 - 2025 Dirk Eddelbuettel and Jeroen Ooms. +## Copyright (C) 2015-2026 Dirk Eddelbuettel and Jeroen Ooms. ## ## This file is part of Rblpapi ## diff --git a/configure.win b/configure.win index 473238f..5d5df2d 100644 --- a/configure.win +++ b/configure.win @@ -2,5 +2,4 @@ : ${R_HOME:=`R RHOME`} -echo "+++ hello from configure.win" ${R_HOME}/bin/Rscript tools/configureWin.R diff --git a/tools/configureWin.R b/tools/configureWin.R index 0367bac..2b0e060 100644 --- a/tools/configureWin.R +++ b/tools/configureWin.R @@ -1,12 +1,10 @@ ## See e.g. github package 'eddelbuettel/tellme' at r-universe for output on ## various platform; there we aim at windows-arm64 for which we have Blp library -cat("+++ hello from configureWin.R\n") -print(R.version) if (R.version$arch == "aarch64" && R.version$os == "mingw32") { - cat("+++ hello from configureWin.R -- aarch/arm64\n") + ## windows-arm does not have a Blp library so we use the 'no blp' Makevars rc <- file.copy("src/Makevars.no_nlp", "src/Makevars.win") } else { - cat("+++ hello from configureWin.R -- amd64\n") + ## else use the (old) default build (still accounting for 32 bit) rc <- file.copy("src/Makevars.win.in", "src/Makevars.win") }