From bbcacbfca96de61adc044589416f87db943021c6 Mon Sep 17 00:00:00 2001 From: shikokuchuo <53399081+shikokuchuo@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:21:01 +0000 Subject: [PATCH] update readme and add news item --- NEWS.md | 4 ++++ README.Rmd | 4 ++-- README.md | 14 ++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index f7eaf065a..0f422e4ad 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # nanonext 1.5.0.9000 (development) +#### Updates + +* Unified Windows build system now attempts to compile 'libmbedtls' and 'libnng' from source even on R <= 4.1 using Rtools40 or earlier. + # nanonext 1.5.0 #### Library Updates diff --git a/README.Rmd b/README.Rmd index 843950fd3..d0ddfb9d7 100644 --- a/README.Rmd +++ b/README.Rmd @@ -156,9 +156,9 @@ As system libraries, 'libnng' is available as libnng-dev (deb) or nng-devel (rpm #### Windows -For R >= 4.2 using the 'Rtools42' or newer toolchains, 'libnng' v1.10.1 and 'libmbedtls' v3.6.2 will be automatically compiled from the package sources during installation. +On Windows, 'libnng' v1.10.1 and 'libmbedtls' v3.6.2 will be compiled from the package sources during installation and hence requires the 'Rtools' toolchain. -For previous R versions, pre-compiled 'libnng' v1.10.1 and 'libmbedtls' v3.6.2 libraries are downloaded and used for installation instead. +For R >= 4.2 using the 'Rtools42' or newer toolchains, the prerequisite 'cmake' is included. For previous R versions using 'Rtools40' or earlier, it may be necessary to separately install a version of 'cmake' in Windows and ensure that it is added to your system's `PATH`. ### Acknowledgements and Links diff --git a/README.md b/README.md index 4efb34a00..d9e54b6b3 100644 --- a/README.md +++ b/README.md @@ -201,12 +201,14 @@ OpenCSW - refer to the ‘cmake’ website for the latest source file.* #### Windows -For R \>= 4.2 using the ‘Rtools42’ or newer toolchains, ‘libnng’ v1.10.1 -and ‘libmbedtls’ v3.6.2 will be automatically compiled from the package -sources during installation. - -For previous R versions, pre-compiled ‘libnng’ v1.10.1 and ‘libmbedtls’ -v3.6.2 libraries are downloaded and used for installation instead. +On Windows, ‘libnng’ v1.10.1 and ‘libmbedtls’ v3.6.2 will be compiled +from the package sources during installation and hence requires the +‘Rtools’ toolchain. + +For R \>= 4.2 using the ‘Rtools42’ or newer toolchains, the prerequisite +‘cmake’ is included. For previous R versions using ‘Rtools40’ or +earlier, it may be necessary to separately install a version of ‘cmake’ +in Windows and ensure that it is added to your system’s `PATH`. ### Acknowledgements and Links