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

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

Merged
merged 5 commits into from
Dec 17, 2019
Merged

Conversation

eddelbuettel
Copy link
Member

See the discussion and resolution in #1035 -- this addresses a narrow need for debugging when using windows and sourceCpp().

Checklist

  • Code compiles correctly
  • R CMD check still passes all tests
  • Document the changes by file in ChangeLog
  • User confirmed issue as addressed

@codecov-io
Copy link

codecov-io commented Dec 17, 2019

Codecov Report

Merging #1037 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1037      +/-   ##
==========================================
+ Coverage   91.92%   91.92%   +<.01%     
==========================================
  Files          64       64              
  Lines        2935     2936       +1     
==========================================
+ Hits         2698     2699       +1     
  Misses        237      237
Impacted Files Coverage Δ
R/Attributes.R 90.4% <100%> (+0.02%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 43a6d84...9da65da. Read the comment docs.

} else {
if (verbose && windowsDebugDLL) {
message("The 'windowsDebugDLL' toggle is ignored on 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

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...

@@ -9,6 +9,8 @@
\itemize{
\item Safer \code{Rcpp_list*}, \code{Rcpp_lang*} and
\code{Function.operator()} (Romain in \ghpr{1014}, \ghit{1015}).
\item A number of \code{#nocov} markers were added (Dirk in
\ghprP1036}).
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
\ghprP1036}).
\ghpr{1036}).

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmpf. I could swear I can a check which should spotted that. Will fix!

@@ -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 :)

@eddelbuettel
Copy link
Member Author

Thanks for the review. There isn't all that much else here, and you caught the one obvious thinko, so I think I'll merge this now.

@eddelbuettel eddelbuettel merged commit ee2e102 into master Dec 17, 2019
\item Unavailable packages referred to in \code{LinkingTo} are now
reported (Dirk in \ghpr{1027} fixing \ghit{1026}).
\item The \code{sourceCpp} function can now create a debug DLL on
Windows (Dirk in \ghpr{1037} fixing \ghit{ghit}).
Copy link
Contributor

Choose a reason for hiding this comment

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

Also, there's \ghit{ghit}

Copy link
Member Author

Choose a reason for hiding this comment

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

Bah. Something must be wrong with the water. Or the coffee. Or both.

Changed to \ghit{1035}. Thanks again.

@eddelbuettel eddelbuettel deleted the feature/win_debug_dll branch December 20, 2019 13:43
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.

None yet

3 participants