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.

Sign up for GitHub

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

Jump to bottom

Feature/win debug dll (closes #1035) #1037

Merged
merged 5 commits into from
Dec 17, 2019
Merged

Feature/win debug dll (closes #1035) #1037

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26befe8
add new option windowsDebugDLL
eddelbuettel Dec 15, 2019
cd8d2dd
roll minor version
eddelbuettel Dec 15, 2019
4b86c1b
add a few NEWS.Rd entries from a few recent PRs
eddelbuettel Dec 17, 2019
3268980
improved when-not-on-windows logic (thanks, @coatless)
eddelbuettel Dec 17, 2019
9da65da
add missing comma
eddelbuettel Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/Attributes.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ sourceCpp <- function(file = "",
} else {
if (windowsDebugDLL) {
if (verbose) {
message("The 'windowsDebugDLL' toggle is ignored on "
message("The 'windowsDebugDLL' toggle is ignored on ",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch on this one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well it was a last-second edit to comply with the @jjallaire style of less than 80 columns. I find 100 or so easier and this is what I got for it :)

"non-Windows platforms.")
}
windowsDebugDLL <- FALSE # now we do not need to deal with OS choice below
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be outside the if()? As it stands now, this will only trigger if verbose = TRUE is passed (it normally isn't.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch. I think you are correct. Will fix.

Copy link
Member Author

@eddelbuettel eddelbuettel Dec 17, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New variant:

            if (verbose) {                                                                                                                                                                                         
                message("The 'windowsDebugDLL' toggle is ignored on "                                                                                                                                              
                        "non-Windows platforms.")                                                                                                                                                                  
            }                                                                                                                                                                                                      
            windowsDebugDLL <- FALSE    # now we do not need to deal with OS choice below                                                                                                                          
        }                                                       # #nocov end

Better...

Expand Down