Skip to content

Commit 70ebde8

Browse files
committed
chore: Updates to rextendr and prepares for CRAN release
1 parent 0de0304 commit 70ebde8

File tree

13 files changed

+317
-47
lines changed

13 files changed

+317
-47
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@
1616
^src/Makevars$
1717
^src/Makevars\.win$
1818
^Taskfile.yml$
19+
^src/rust/target$

DESCRIPTION

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Depends: R (>= 4.2.0)
1717
Imports:
1818
glue,
1919
promises,
20-
purrr,
21-
stats,
2220
stringr,
2321
shiny,
2422
later,
@@ -36,4 +34,4 @@ Encoding: UTF-8
3634
Roxygen: list(markdown = TRUE)
3735
RoxygenNote: 7.3.2
3836
Config/rextendr/version: 0.3.1.9001
39-
SystemRequirements: Cargo (Rust's package manager), rustc
37+
SystemRequirements: Cargo (Rust's package manager), rustc, OpenSSL >= 1.0.2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ connections are started until the user is authenticated. It also prevents
117117
sensitive data in the UI portion of the application from being exposed to
118118
unauthenticated users.
119119

120-
![Auth Flow](man/flow.png)
120+
![Auth Flow](vignettes/flow.png)

Taskfile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
tasks:
77
clean:
88
- rm -rf src/.cargo
9-
- rm -rf orbweaver_*.tar.gz
9+
- rm -rf tapLock_*.tar.gz
1010
vendor:
1111
dir: src/rust
1212
deps:
@@ -40,4 +40,4 @@ tasks:
4040
- clean
4141
cmds:
4242
- R CMD build .
43-
- R CMD check orbweaver*.tar.gz
43+
- R CMD check tapLock*.tar.gz

src/Makevars.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
TARGET_DIR = ./rust/target
22
LIBDIR = $(TARGET_DIR)/release
3-
STATLIB = $(LIBDIR)/libtapLock.a
4-
PKG_LIBS = -L$(LIBDIR) -ltapLock
3+
STATLIB = $(LIBDIR)/libtap_lock.a
4+
PKG_LIBS = -L$(LIBDIR) -ltap_lock
55

66
all: C_clean
77

src/Makevars.win.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
22

33
TARGET_DIR = ./rust/target
44
LIBDIR = $(TARGET_DIR)/$(TARGET)/release
5-
STATLIB = $(LIBDIR)/libtapLock.a
6-
PKG_LIBS = -L$(LIBDIR) -ltapLock -lws2_32 -lntdll -lbcrypt -luserenv
5+
STATLIB = $(LIBDIR)/libtap_lock.a
6+
PKG_LIBS = -L$(LIBDIR) -ltap_lock -luserenv
77

88
all: C_clean
99

0 commit comments

Comments
 (0)