Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Biarch to DESCRIPTION, fix #19 #23

Merged
merged 4 commits into from
Feb 24, 2021
Merged

Conversation

jeffreyhanson
Copy link
Contributor

@jeffreyhanson jeffreyhanson commented Feb 16, 2021

This PR is one solution to fix #19. It involves adding Biarch: true to the DESCRIPTION. I have tested that it successfully builds and passes CRAN checks on WinBuilder. Specifically, I used the R command devtools::check_win_devel(vignettes = F). Please see attached files for WinBuilder results (note .Rout files have been renamed to .txt for GitHub compatibility):

rgl-Ex_i386.txt
rgl-Ex_x64.txt
00install.txt
rgl_0.105.14.zip
00check.txt

@dmurdoch
Copy link
Owner

That looks very promising!

@jeffreyhanson
Copy link
Contributor Author

Thanks - I didn't bother with the vignettes because I had issues installing the tcltk Suggests dependencies. Would you like to see WinBuilder results with the vignettes present? If so, I could try running this from my Windows laptop.

@dmurdoch
Copy link
Owner

Thanks - I didn't bother with the vignettes because I had issues installing the tcltk Suggests dependencies. Would you like to see WinBuilder results with the vignettes present? If so, I could try running this from my Windows laptop.

No need for that -- it passed the automatic checks, which include vignettes. I guess my main interest would be in whether you can install it on a laptop in both 32 bit and 64 bit R, and have them both work.

@jeffreyhanson
Copy link
Contributor Author

I think I've verified that this PR fixes the issue. To do this, I've run an R script (see rgl-check.txt) using R x64 version 3.5.0 that uses system calls to install rgl in x64 and i385 builds of R version 4.0.4. Specifically, the script (1) installs rgl from source on CRAN to install any dependencies for R version 4.0.4 x64 and i385 builds, (2) removes rgl from R version 4.0.4 x64 and i385 builds, (3) installs the pre-built binary of the rgl attached to this PR from winbuilder for only R version 4.0.4 x64 build, and (4) verifies that rgl is available on both R version 4.0.4 x64 and i358 builds.

The log file (see rgl-check-Rout.txt) indicates that installing the pre-built binary of rgl for this PR makes rgl available for both x64 and i385 - so I think that means it works? Please let me know if I'm missing anything? Are there any additional outputs or tests I can provide?

rgl-check.txt
rgl-check-Rout.txt

@dmurdoch
Copy link
Owner

Have you tried using this in one of the CI checks for issue #19 ? With the usual devtools tools, I believe you could set a Remotes: field in your DESCRIPTION to work from your build rather than the master one.

@dmurdoch dmurdoch marked this pull request as ready for review February 24, 2021 16:54
@dmurdoch dmurdoch merged commit 332ccdf into dmurdoch:master Feb 24, 2021
@jeffreyhanson jeffreyhanson deleted the biarch branch February 24, 2021 19:58
@jeffreyhanson
Copy link
Contributor Author

Brilliant - thanks for merging this PR!

dmurdoch added a commit that referenced this pull request Mar 3, 2021
* Add drat repository for webshot2

* Fixes to address issues on Solaris, plus some minor stuff (#20)

* Ignore CRAN-RELEASE file

* Allow rgl.snapshot args to snapshot3d.  Fixes issue #21. (#22)

* Protect against missing Pandoc in transparency.Rmd.

* Commit notes etc.

* Remove notes

* Update version number and NEWS

* Fixes issue #27 (#28)

* Ugly workaround for incompatibility with quartz device.  Code to illustrate is

 library(rgl)
 plot(1:10, col=7)
 open3d()

which fails on macOS.

* Additional test for WebGL support, fixes issue #31. (#32)

* Additional test for WebGL support, fixes issue #31.

* add Biarch to DESCRIPTION, fix #19 (#23)

* add Biarch: true to DESCRIPTION, fix issue #19

* Fixes issue #33 : the code for fat lines skipped the wrong entries (#34)

* Fixes issue #33 : the code for fat lines skipped the wrong entries

* Fix lint warning

* Workaround for quartz() device incompatibility (#35)

* Ugly workaround for incompatibility with quartz device.  Code to illustrate is

 library(rgl)
 plot(1:10, col=7)
 open3d()

which fails on macOS.

Allowed R option "rgl.startQuartz" to override the automatic decision, fixed it so it runs on RStudio by default.

* README updates (fixes issue #26)

* Problem building with parallel make (issue #36) (#37)

Fixes error in src/useNULL/Makevars.in that only showed up in parallel makes.

* Get ready for CRAN submission

Co-authored-by: Jeff Hanson <jeffrey.hanson@uqconnect.edu.au>
dmurdoch added a commit that referenced this pull request Mar 8, 2021
* A start:  inserts the JSON, but doesn't add the assets.

* Merge master into branch (#41)

* Add drat repository for webshot2

* Fixes to address issues on Solaris, plus some minor stuff (#20)

* Ignore CRAN-RELEASE file

* Allow rgl.snapshot args to snapshot3d.  Fixes issue #21. (#22)

* Protect against missing Pandoc in transparency.Rmd.

* Commit notes etc.

* Remove notes

* Update version number and NEWS

* Fixes issue #27 (#28)

* Ugly workaround for incompatibility with quartz device.  Code to illustrate is

 library(rgl)
 plot(1:10, col=7)
 open3d()

which fails on macOS.

* Additional test for WebGL support, fixes issue #31. (#32)

* Additional test for WebGL support, fixes issue #31.

* add Biarch to DESCRIPTION, fix #19 (#23)

* add Biarch: true to DESCRIPTION, fix issue #19

* Fixes issue #33 : the code for fat lines skipped the wrong entries (#34)

* Fixes issue #33 : the code for fat lines skipped the wrong entries

* Fix lint warning

* Workaround for quartz() device incompatibility (#35)

* Ugly workaround for incompatibility with quartz device.  Code to illustrate is

 library(rgl)
 plot(1:10, col=7)
 open3d()

which fails on macOS.

Allowed R option "rgl.startQuartz" to override the automatic decision, fixed it so it runs on RStudio by default.

* README updates (fixes issue #26)

* Problem building with parallel make (issue #36) (#37)

Fixes error in src/useNULL/Makevars.in that only showed up in parallel makes.

* Get ready for CRAN submission

Co-authored-by: Jeff Hanson <jeffrey.hanson@uqconnect.edu.au>

* Some progress, but not working yet.

* Hack to get scripts from the WebGL vignette files.

* Update notes

* Getting closer, but dependencies aren't being handled properly yet.

* Now working with is_low_change etc.

* Fix leakage across example pages, start on reference index

* Updates from master branch, plus changes to avoid check errors

* Updates (skip CI)

* Finish first version of reference page, start on deployment.

* Copy code from other workflow

Co-authored-by: Jeff Hanson <jeffrey.hanson@uqconnect.edu.au>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Windows Biarch support (has implications for testing pkgs with GitHub Actions)
2 participants