Repository navigation
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes the Windows JRI build issues reported in #352 and #355.
Changes
configure.winto usesrc/jri/instead of the oldjri/paths.#ifndef Win32guard aroundRinterface.h, which was lost when the include was moved fromRinit.ctoRdecl.hin commit 54bfb36. For R 4.6.0 and later, explicitly declareR_ReadConsoleon Windows.Testing
Verified on Windows 11 with R 4.6.2 and R-devel 4.7.0 (r90914), using Rtools45 and Temurin JDK 11:
R CMD INSTALL --buildsucceeds.jri.dlland the related JAR files are generated and placed correctly.rtestruns successfully.rniGetAttrNamesregression tests from JRI: use attribute-name length in rniGetAttrNames #351 pass.Additional testing
To verify the fix for the regression introduced by an earlier commit in this PR (d002383), I tested on macOS (Apple Silicon) with R 4.5.3 and R 4.6.2 using JDK 25. Package installation and JRI
rtestsucceeded on both versions.