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

Bugfix for gcc-493 #1155

Merged
merged 13 commits into from Apr 18, 2016

Conversation

Projects
None yet
2 participants
@jimhester
Member

jimhester commented Apr 18, 2016

I ended up special casing the situation on win-builder as it seems like a reasonable layout to support. The old toolchain installs to Rtools/gcc-4.6.3 so installing the new on to Rtools/gcc-4.9.3 does make some sense even if it is not the default installation location.

This also includes some cleanup, - 1b0fc66 suppresses the output of create() used in the infrastucture tests so it won't clutter the output.

  • 1023cb9 uses a mock response for the install_version tests as they were brittle on appveyor also turns on caching and uses http CRAN URLs for testing on old release.

I am mainly opening this as a PR to make sure it is working before merging.

@jimhester

This comment has been minimized.

Member

jimhester commented Apr 18, 2016

678dc1e should be ok to merge.

It got a clean check from win-builder (http://win-builder.r-project.org/ZrVV35IPB27C/00check.log)

R/rtools.r Outdated
@@ -131,21 +133,53 @@ setup_rtools <- function(cache = TRUE, debug = FALSE) {
TRUE
}
scan_path_for_rtools <- function(debug = FALSE) {
scan_path_for_rtools <- function(
debug = FALSE,

This comment has been minimized.

@hadley

hadley Apr 18, 2016

Member

Can you indent these lines please?

This comment has been minimized.

@jimhester

jimhester Apr 18, 2016

Member

How much indentation? Just one additional level or to line up with function?

This comment has been minimized.

@hadley

hadley Apr 18, 2016

Member

I like to have arguments line up with the ( in function(

This comment has been minimized.

@jimhester

jimhester Apr 18, 2016

Member

Great that is what I did 😄!

@hadley

This comment has been minimized.

Member

hadley commented Apr 18, 2016

LGTM. Can you add a bullet to NEWS? Let me know once you merge, and I'll release

@jimhester jimhester merged commit 6cd9389 into r-lib:master Apr 18, 2016

0 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@jimhester

This comment has been minimized.

Member

jimhester commented Apr 18, 2016

Ok now merged, can be released whenever you are ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment