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

chore: Vendor cpp11 headers #451

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

pachadotdev
Copy link
Contributor

@pachadotdev pachadotdev commented Nov 8, 2023

@krlmlr here are my changes in relation to #450
in the issue I detail where to find my changes and how I vendored the headers

Closes #450.

Copy link
Contributor

aviator-app bot commented Nov 8, 2023

Current Aviator status

Aviator will automatically update this comment as the status of the PR changes.
Comment /aviator refresh to force Aviator to re-examine your PR (or learn about other /aviator commands).

This pull request is currently open (not queued).

How to merge

To merge this PR, comment /aviator merge or add the mergequeue label.


See the real-time status of this PR on the Aviator webapp.

Use the Aviator Chrome Extension to see the status of your PR within GitHub.

NEWS.md Outdated Show resolved Hide resolved
src/Makevars.in Outdated Show resolved Hide resolved
@pachadotdev
Copy link
Contributor Author

ok @krlmlr , it should look good now

Copy link
Member

@krlmlr krlmlr left a comment

Choose a reason for hiding this comment

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

Thanks, looks great!

I do wonder why cpp11::cpp_vendor() insists on putting the headers into inst/include .


try(dir.create(file.path(vendor_dir, "cpp11"), recursive = TRUE))

for (f in finp) {
Copy link
Member

Choose a reason for hiding this comment

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

What is finp ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@krlmlr sorry, I accidentally deleted that part, it is a list of all the headers I added. I will re-add that line

Copy link
Member

Choose a reason for hiding this comment

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

I'll need to run this script on my machine without errors (and perhaps without unnecessary actions).

}

unlink(file.path(vendor_dir, "inst"), recursive = TRUE)

Copy link
Member

Choose a reason for hiding this comment

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

Everything below here seems to be a one-time action?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes

src/Makevars.in Outdated Show resolved Hide resolved
@krlmlr krlmlr changed the title vendoring #450 chore: Vendor cpp11 headers Nov 8, 2023
pachadotdev and others added 2 commits November 8, 2023 17:19
Co-authored-by: Kirill Müller <krlmlr@users.noreply.github.com>
@pachadotdev
Copy link
Contributor Author

Thanks, looks great!

I do wonder why cpp11::cpp_vendor() insists on putting the headers into inst/include .

I will send then a PR, because it is the default, which forced me to write some code for a 1 time action (otherwise I had to create a video of my clicks)

@krlmlr
Copy link
Member

krlmlr commented Nov 9, 2023

Thanks. I don't think it's a one-time action, at least in the medium term. If cpp11 gets nice new features, we want to use them.

@pachadotdev
Copy link
Contributor Author

pachadotdev commented Nov 9, 2023 via email

@pachadotdev
Copy link
Contributor Author

@krlmlr hi, do you think this can be merged?

src/Makevars.win Outdated Show resolved Hide resolved

try(dir.create(file.path(vendor_dir, "cpp11"), recursive = TRUE))

for (f in finp) {
Copy link
Member

Choose a reason for hiding this comment

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

I'll need to run this script on my machine without errors (and perhaps without unnecessary actions).

Co-authored-by: Kirill Müller <krlmlr@users.noreply.github.com>
@pachadotdev
Copy link
Contributor Author

@krlmlr any update on this?
happy holidays

@krlmlr
Copy link
Member

krlmlr commented Apr 1, 2024

Let's wait for r-lib/cpp11#353. Also, the upside of no vendoring means that there's less maintenance effort at the (fairly low) risk of breakages from upstream.

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.

vendoring cpp11 headers
2 participants