Skip to content

Commit 7a77552

Browse files
fix: file type associonations and cleanup script paths (#487)
1 parent 6a2ffdd commit 7a77552

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

R/use_extendr.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ use_extendr <- function(
121121

122122
use_rextendr_template(
123123
"cleanup",
124-
save_as = file.path("src", "cleanup"),
124+
save_as = file.path("cleanup"),
125125
quiet = quiet,
126126
overwrite = overwrite
127127
)
128128

129129
use_rextendr_template(
130130
"cleanup.win",
131-
save_as = file.path("src", "cleanup.win"),
131+
save_as = file.path("cleanup.win"),
132132
quiet = quiet,
133133
overwrite = overwrite
134134
)

inst/templates/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
"${workspaceFolder}/src/rust/Cargo.toml"
44
],
55
"files.associations": {
6+
"Makevars": "makefile",
67
"Makevars.in": "makefile",
78
"Makevars.win": "makefile",
9+
"Makevars.win.in": "makefile",
810
"configure": "shellscript",
911
"configure.win": "shellscript",
1012
"cleanup": "shellscript",

tests/testthat/_snaps/use_extendr.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@
375375
> File 'src/entrypoint.c' already exists. Skip writing the file.
376376
> File 'src/Makevars.in' already exists. Skip writing the file.
377377
> File 'src/Makevars.win.in' already exists. Skip writing the file.
378-
> File 'src/cleanup' already exists. Skip writing the file.
379-
> File 'src/cleanup.win' already exists. Skip writing the file.
378+
> File 'cleanup' already exists. Skip writing the file.
379+
> File 'cleanup.win' already exists. Skip writing the file.
380380
> File 'src/.gitignore' already exists. Skip writing the file.
381381
> File 'src/rust/Cargo.toml' already exists. Skip writing the file.
382382
> File 'src/rust/src/lib.rs' already exists. Skip writing the file.
@@ -398,8 +398,8 @@
398398
v Writing 'src/entrypoint.c'
399399
v Writing 'src/Makevars.in'
400400
v Writing 'src/Makevars.win.in'
401-
v Writing 'src/cleanup'
402-
v Writing 'src/cleanup.win'
401+
v Writing 'cleanup'
402+
v Writing 'cleanup.win'
403403
v Writing 'src/.gitignore'
404404
v Writing 'src/rust/Cargo.toml'
405405
v Writing 'src/rust/src/lib.rs'

0 commit comments

Comments
 (0)