Skip to content

Commit dd9a382

Browse files
authored
Support Package in R (#83)
* lib: Import package deps Signed-off-by: Ce Gao <[email protected]> * lib: Add maven-ant-tasks Signed-off-by: Ce Gao <[email protected]> * ant: Update the stragety about libraries Signed-off-by: Ce Gao <[email protected]> * BuiltinApplet: Update the engine Signed-off-by: Ce Gao <[email protected]>
1 parent 291a9cc commit dd9a382

File tree

108 files changed

+135
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+135
-16
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ build.number
1515
# Processing.R
1616
bin/
1717
dist/
18-
build/
18+
/build/
1919
try/
2020
*.log
2121
build.xml

build.xml.template

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<project name="Processing.R" default="install" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
2+
<project name="Processing.R" default="install" basedir="." xmlns:jacoco="antlib:org.jacoco.ant" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
33
<property name="mode.name" value="RLangMode" />
44

55
<!-- folder to install modes in (probably a folder called "modes" inside your sketchbook folder) -->
@@ -17,6 +17,7 @@
1717
<property name="try" value="try" />
1818
<property name="mode-lib" value="lib/mode" />
1919
<property name="test-lib" value="lib/test" />
20+
<property name="build-lib" value="lib/build" />
2021
<property name="src" value="src" />
2122
<property name="build" value="build" />
2223
<property name="bin" value="bin" />
@@ -30,6 +31,27 @@
3031
<property name="result.report.dir" location="${test.build.dir}/site/jacoco"/>
3132
<property name="result.exec.file" location="${test.build.dir}/jacoco.exec"/>
3233

34+
<property name="renjin-version" value="0.8.2411" />
35+
36+
<!-- Maven deps -->
37+
<path id="maven-ant-tasks.classpath" path="${build-lib}/maven-ant-tasks-2.1.3.jar" />
38+
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
39+
uri="antlib:org.apache.maven.artifact.ant"
40+
classpathref="maven-ant-tasks.classpath" />
41+
<artifact:remoteRepository id="remote.repository" url="https://nexus.bedatadriven.com/content/groups/public/" />
42+
<artifact:dependencies filesetId="dependency.fileset"
43+
versionsId="dependency.versions">
44+
<remoteRepository refid="remote.repository" />
45+
<dependency groupId="org.renjin" artifactId="renjin-script-engine" version="${renjin-version}" />
46+
<dependency groupId="org.renjin" artifactId="renjin-cli" version="${renjin-version}" />
47+
</artifact:dependencies>
48+
<copy todir="${mode-lib}">
49+
<fileset refid="dependency.fileset" />
50+
<mapper classpathref="maven-ant-tasks.classpath"
51+
classname="org.apache.maven.artifact.ant.VersionMapper"
52+
from="${dependency.versions}" to="flatten" />
53+
</copy>
54+
3355
<path id="mode-library-classpath">
3456
<pathelement location="${processing.classes.pde}"/>
3557
<fileset dir="${processing.classes.core}">
1.26 MB
Binary file not shown.

lib/mode/aether-api.jar

133 KB
Binary file not shown.
35.9 KB
Binary file not shown.

lib/mode/aether-impl.jar

169 KB
Binary file not shown.

lib/mode/aether-spi.jar

29.9 KB
Binary file not shown.

lib/mode/aether-transport-file.jar

8.76 KB
Binary file not shown.

lib/mode/aether-transport-http.jar

35 KB
Binary file not shown.

lib/mode/aether-util.jar

143 KB
Binary file not shown.

0 commit comments

Comments
 (0)