Skip to content

Commit f8e2ab8

Browse files
committed
fix(demo): Add install_github, fix build paths
1 parent a30e52f commit f8e2ab8

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: swigr
22
Title: What the Package Does (One Line, Title Case)
3-
Version: 0.0.0.9000
3+
Version: 0.0.1
44
Authors@R:
55
person(given = "First",
66
family = "Last",

build.R

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ install.packages("roxygen2")
33

44
vignette("namespace")
55

6-
setwd("~/dev/projects/icelab/code/test/swig")
6+
# Create repo
7+
setwd("~/dev/R/swig")
78
devtools::create("swigr")
89

910
usethis::use_vignette("introduction")
@@ -14,12 +15,13 @@ devtools::build()
1415

1516
devtools::build(binary = T)
1617

17-
setwd("~/dev/projects/icelab/code/test/swig")
18+
# Install local repo
19+
setwd("~/dev/R/swig")
1820
devtools::install("swigr")
19-
setwd("~/dev/projects/icelab/code/test/swig/swigr")
20-
# test:
21-
swigr::test_r()
21+
setwd("~/dev/R/swig/swigr")
2222

23+
# Test package
24+
swigr::test_r()
2325
swigr::test_example()
2426

2527
devtools::load_all()

demo/runme.R

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
# This file illustrates the proxy class C++ interface generated
2-
# by SWIG.
2+
# by SWIG, with some additional R functions added to the package
33

44
# dyn.load(paste("example", .Platform$dynlib.ext, sep=""))
55
# source("example.R")
66
# cacheMetaData(1)
77

8+
install.packages("devtools")
9+
devtools::install_github("danieledler/swigr")
10+
11+
swigr::test_example()
12+
813
# ----- Object creation -----
914

1015
print("Creating some objects:")
11-
circle <- Circle(10)
16+
circle <- swigr::Circle(10)
1217
print (" Created circle")
13-
square <- Square(10)
18+
square <- swigr::Square(10)
1419
print (" Created square")
1520

1621
# ----- Access a static member -----
1722

18-
sprintf("A total of %d shapes were created", Shape_nshapes())
23+
sprintf("A total of %d shapes were created", swigr::Shape_nshapes())
1924

2025
# ----- Member data access -----
2126

@@ -44,8 +49,8 @@ sprintf(" area = %f perimeter = %f", o$area(), o$perimeter())
4449
})
4550

4651
print("Guess I'll clean up now")
47-
delete(circle)
48-
delete(square)
52+
swigr::delete(circle)
53+
swigr::delete(square)
4954

50-
sprintf("%d shapes remain", Shape_nshapes())
51-
print ("Goodbye");
55+
sprintf("%d shapes remain", swigr::Shape_nshapes())
56+
print ("Goodbye")

0 commit comments

Comments
 (0)