Support Package in R (#83)

* lib: Import package deps Signed-off-by: Ce Gao <ce.gao@outlook.com> * lib: Add maven-ant-tasks Signed-off-by: Ce Gao <ce.gao@outlook.com> * ant: Update the stragety about libraries Signed-off-by: Ce Gao <ce.gao@outlook.com> * BuiltinApplet: Update the engine Signed-off-by: Ce Gao <ce.gao@outlook.com>
processing-r · Jul 5, 2017 · dd9a382 · dd9a382
1 parent 291a9cc
commit dd9a382
Show file tree

Hide file tree

Showing 108 changed files with 135 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,7 @@ build.number
 # Processing.R
 bin/
 dist/
-build/
+/build/
 try/
 *.log
 build.xml

diff --git a/build.xml.template b/build.xml.template
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Processing.R" default="install" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
+<project name="Processing.R" default="install" basedir="." xmlns:jacoco="antlib:org.jacoco.ant" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
     <property name="mode.name" value="RLangMode" />
 
     <!-- folder to install modes in (probably a folder called "modes" inside your sketchbook folder) -->
@@ -17,6 +17,7 @@
     <property name="try" value="try" />
     <property name="mode-lib" value="lib/mode" />
     <property name="test-lib" value="lib/test" />
+    <property name="build-lib" value="lib/build" />
     <property name="src" value="src" />
     <property name="build" value="build" />
     <property name="bin" value="bin" />
@@ -30,6 +31,27 @@
     <property name="result.report.dir" location="${test.build.dir}/site/jacoco"/>
     <property name="result.exec.file" location="${test.build.dir}/jacoco.exec"/>
 
+    <property name="renjin-version" value="0.8.2411" />
+
+    <!-- Maven deps -->
+    <path id="maven-ant-tasks.classpath" path="${build-lib}/maven-ant-tasks-2.1.3.jar" />
+    <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+        uri="antlib:org.apache.maven.artifact.ant"
+        classpathref="maven-ant-tasks.classpath" />
+    <artifact:remoteRepository id="remote.repository" url="https://nexus.bedatadriven.com/content/groups/public/" />
+    <artifact:dependencies filesetId="dependency.fileset"
+        versionsId="dependency.versions">
+        <remoteRepository refid="remote.repository" />
+        <dependency groupId="org.renjin" artifactId="renjin-script-engine" version="${renjin-version}" />
+        <dependency groupId="org.renjin" artifactId="renjin-cli" version="${renjin-version}" />
+    </artifact:dependencies>
+    <copy todir="${mode-lib}">
+        <fileset refid="dependency.fileset" />
+        <mapper classpathref="maven-ant-tasks.classpath"
+            classname="org.apache.maven.artifact.ant.VersionMapper"
+            from="${dependency.versions}" to="flatten" />
+    </copy>
+
     <path id="mode-library-classpath">
         <pathelement location="${processing.classes.pde}"/>
         <fileset dir="${processing.classes.core}">

diff --git a/lib/build/maven-ant-tasks-2.1.3.jar b/lib/build/maven-ant-tasks-2.1.3.jar
diff --git a/lib/mode/aether-api.jar b/lib/mode/aether-api.jar
diff --git a/lib/mode/aether-connector-basic.jar b/lib/mode/aether-connector-basic.jar
diff --git a/lib/mode/aether-impl.jar b/lib/mode/aether-impl.jar
diff --git a/lib/mode/aether-spi.jar b/lib/mode/aether-spi.jar
diff --git a/lib/mode/aether-transport-file.jar b/lib/mode/aether-transport-file.jar
diff --git a/lib/mode/aether-transport-http.jar b/lib/mode/aether-transport-http.jar
diff --git a/lib/mode/aether-util.jar b/lib/mode/aether-util.jar
diff --git a/lib/mode/airline.jar b/lib/mode/airline.jar
diff --git a/lib/mode/all.pom b/lib/mode/all.pom
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.github.fommil.netlib</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.1</version>
+    </parent>
+
+    <artifactId>all</artifactId>
+    <packaging>pom</packaging>
+    <version>1.1.2</version>
+
+    <dependencies>
+        <dependency>
+            <!-- WORKAROUND: https://github.com/sbt/sbt/issues/861 -->
+            <groupId>net.sourceforge.f2j</groupId>
+            <artifactId>arpack_combined_all</artifactId>
+            <version>0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>core</artifactId>
+            <version>1.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_ref-osx-x86_64</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_ref-linux-x86_64</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_ref-linux-i686</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_ref-win-x86_64</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_ref-win-i686</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_ref-linux-armhf</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_system-osx-x86_64</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_system-linux-x86_64</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_system-linux-i686</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_system-linux-armhf</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_system-win-x86_64</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>netlib-native_system-win-i686</artifactId>
+            <version>${project.parent.version}</version>
+            <classifier>natives</classifier>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/lib/mode/aopalliance.jar b/lib/mode/aopalliance.jar
diff --git a/lib/mode/arpack_combined_all.jar b/lib/mode/arpack_combined_all.jar
diff --git a/lib/mode/asm.jar b/lib/mode/asm.jar
diff --git a/lib/mode/cdi-api.jar b/lib/mode/cdi-api.jar
diff --git a/lib/mode/codemodel.jar b/lib/mode/codemodel.jar
diff --git a/lib/mode/commons-codec.jar b/lib/mode/commons-codec.jar
diff --git a/lib/mode/commons-compress.jar b/lib/mode/commons-compress.jar
diff --git a/lib/mode/commons-logging.jar b/lib/mode/commons-logging.jar
diff --git a/lib/mode/commons-math.jar b/lib/mode/commons-math.jar
diff --git a/lib/mode/commons-vfs2.jar b/lib/mode/commons-vfs2.jar
diff --git a/lib/mode/compiler.jar b/lib/mode/compiler.jar
diff --git a/lib/mode/core.jar b/lib/mode/core.jar
diff --git a/lib/mode/datasets.jar b/lib/mode/datasets.jar
diff --git a/lib/mode/gcc-bridge-compiler.jar b/lib/mode/gcc-bridge-compiler.jar
diff --git a/lib/mode/gcc-bridge-plugin-linux-x86_64.jar b/lib/mode/gcc-bridge-plugin-linux-x86_64.jar
diff --git a/lib/mode/gcc-runtime.jar b/lib/mode/gcc-runtime.jar
diff --git a/lib/mode/grDevices.jar b/lib/mode/grDevices.jar
diff --git a/lib/mode/graphics.jar b/lib/mode/graphics.jar
diff --git a/lib/mode/grid.jar b/lib/mode/grid.jar
diff --git a/lib/mode/guava-17.0-sources.jar b/lib/mode/guava-17.0-sources.jar
diff --git a/lib/mode/guava-17.0.jar b/lib/mode/guava-17.0.jar
diff --git a/lib/mode/guava.jar b/lib/mode/guava.jar
diff --git a/lib/mode/hamcrest.jar b/lib/mode/hamcrest.jar
diff --git a/lib/mode/httpclient.jar b/lib/mode/httpclient.jar
diff --git a/lib/mode/httpcore.jar b/lib/mode/httpcore.jar
diff --git a/lib/mode/jackson-annotations.jar b/lib/mode/jackson-annotations.jar
diff --git a/lib/mode/jackson-core.jar b/lib/mode/jackson-core.jar
diff --git a/lib/mode/jackson-databind.jar b/lib/mode/jackson-databind.jar
diff --git a/lib/mode/javax.inject.jar b/lib/mode/javax.inject.jar
diff --git a/lib/mode/jcl-over-slf4j.jar b/lib/mode/jcl-over-slf4j.jar
diff --git a/lib/mode/jline.jar b/lib/mode/jline.jar
diff --git a/lib/mode/jniloader.jar b/lib/mode/jniloader.jar
diff --git a/lib/mode/joda-time.jar b/lib/mode/joda-time.jar
diff --git a/lib/mode/jsr250-api.jar b/lib/mode/jsr250-api.jar
diff --git a/lib/mode/jsr305.jar b/lib/mode/jsr305.jar
diff --git a/lib/mode/maven-aether-provider.jar b/lib/mode/maven-aether-provider.jar
diff --git a/lib/mode/maven-model-builder.jar b/lib/mode/maven-model-builder.jar
diff --git a/lib/mode/maven-model.jar b/lib/mode/maven-model.jar
diff --git a/lib/mode/maven-repository-metadata.jar b/lib/mode/maven-repository-metadata.jar
diff --git a/lib/mode/maven-scm-api.jar b/lib/mode/maven-scm-api.jar
diff --git a/lib/mode/maven-scm-provider-svn-commons.jar b/lib/mode/maven-scm-provider-svn-commons.jar
diff --git a/lib/mode/maven-scm-provider-svnexe.jar b/lib/mode/maven-scm-provider-svnexe.jar
diff --git a/lib/mode/maven-settings-builder.jar b/lib/mode/maven-settings-builder.jar
diff --git a/lib/mode/maven-settings.jar b/lib/mode/maven-settings.jar
diff --git a/lib/mode/methods.jar b/lib/mode/methods.jar
diff --git a/lib/mode/native_ref-java.jar b/lib/mode/native_ref-java.jar
diff --git a/lib/mode/native_system-java.jar b/lib/mode/native_system-java.jar
diff --git a/lib/mode/netlib-native_ref-linux-armhf-natives.jar b/lib/mode/netlib-native_ref-linux-armhf-natives.jar
diff --git a/lib/mode/netlib-native_ref-linux-i686-natives.jar b/lib/mode/netlib-native_ref-linux-i686-natives.jar
diff --git a/lib/mode/netlib-native_ref-linux-x86_64-natives.jar b/lib/mode/netlib-native_ref-linux-x86_64-natives.jar
diff --git a/lib/mode/netlib-native_ref-osx-x86_64-natives.jar b/lib/mode/netlib-native_ref-osx-x86_64-natives.jar
diff --git a/lib/mode/netlib-native_ref-win-i686-natives.jar b/lib/mode/netlib-native_ref-win-i686-natives.jar
diff --git a/lib/mode/netlib-native_ref-win-x86_64-natives.jar b/lib/mode/netlib-native_ref-win-x86_64-natives.jar
diff --git a/lib/mode/netlib-native_system-linux-armhf-natives.jar b/lib/mode/netlib-native_system-linux-armhf-natives.jar
diff --git a/lib/mode/netlib-native_system-linux-i686-natives.jar b/lib/mode/netlib-native_system-linux-i686-natives.jar
diff --git a/lib/mode/netlib-native_system-linux-x86_64-natives.jar b/lib/mode/netlib-native_system-linux-x86_64-natives.jar
diff --git a/lib/mode/netlib-native_system-osx-x86_64-natives.jar b/lib/mode/netlib-native_system-osx-x86_64-natives.jar
diff --git a/lib/mode/netlib-native_system-win-i686-natives.jar b/lib/mode/netlib-native_system-win-i686-natives.jar
diff --git a/lib/mode/netlib-native_system-win-x86_64-natives.jar b/lib/mode/netlib-native_system-win-x86_64-natives.jar
diff --git a/lib/mode/org.eclipse.sisu.inject.jar b/lib/mode/org.eclipse.sisu.inject.jar
diff --git a/lib/mode/org.eclipse.sisu.plexus.jar b/lib/mode/org.eclipse.sisu.plexus.jar
diff --git a/lib/mode/packager.jar b/lib/mode/packager.jar
diff --git a/lib/mode/parallel.jar b/lib/mode/parallel.jar
diff --git a/lib/mode/plexus-cipher.jar b/lib/mode/plexus-cipher.jar
diff --git a/lib/mode/plexus-classworlds.jar b/lib/mode/plexus-classworlds.jar
diff --git a/lib/mode/plexus-component-annotations.jar b/lib/mode/plexus-component-annotations.jar
diff --git a/lib/mode/plexus-interpolation.jar b/lib/mode/plexus-interpolation.jar
diff --git a/lib/mode/plexus-sec-dispatcher.jar b/lib/mode/plexus-sec-dispatcher.jar
diff --git a/lib/mode/plexus-utils.jar b/lib/mode/plexus-utils.jar
diff --git a/lib/mode/regexp.jar b/lib/mode/regexp.jar
diff --git a/lib/mode/renjin-aether-package-loader.jar b/lib/mode/renjin-aether-package-loader.jar
diff --git a/lib/mode/renjin-appl.jar b/lib/mode/renjin-appl.jar
diff --git a/lib/mode/renjin-asm.jar b/lib/mode/renjin-asm.jar
diff --git a/lib/mode/renjin-blas.jar b/lib/mode/renjin-blas.jar
diff --git a/lib/mode/renjin-cli.jar b/lib/mode/renjin-cli.jar
diff --git a/lib/mode/renjin-core.jar b/lib/mode/renjin-core.jar
diff --git a/lib/mode/renjin-gnur-compiler.jar b/lib/mode/renjin-gnur-compiler.jar
diff --git a/lib/mode/renjin-gnur-installation.jar b/lib/mode/renjin-gnur-installation.jar
diff --git a/lib/mode/renjin-gnur-runtime.jar b/lib/mode/renjin-gnur-runtime.jar
diff --git a/lib/mode/renjin-guava.jar b/lib/mode/renjin-guava.jar
diff --git a/lib/mode/renjin-lapack.jar b/lib/mode/renjin-lapack.jar
diff --git a/lib/mode/renjin-math-common.jar b/lib/mode/renjin-math-common.jar
diff --git a/lib/mode/renjin-nmath.jar b/lib/mode/renjin-nmath.jar
diff --git a/lib/mode/renjin-repl.jar b/lib/mode/renjin-repl.jar
diff --git a/lib/mode/renjin-script-engine-0.8.2364-jar-with-dependencies.jar b/lib/mode/renjin-script-engine-0.8.2364-jar-with-dependencies.jar
diff --git a/lib/mode/renjin-script-engine.jar b/lib/mode/renjin-script-engine.jar
diff --git a/lib/mode/sisu-guice-no_aop.jar b/lib/mode/sisu-guice-no_aop.jar
diff --git a/lib/mode/slf4j-api.jar b/lib/mode/slf4j-api.jar
diff --git a/lib/mode/slf4j-jdk14.jar b/lib/mode/slf4j-jdk14.jar
diff --git a/lib/mode/splines.jar b/lib/mode/splines.jar
diff --git a/lib/mode/stats.jar b/lib/mode/stats.jar
diff --git a/lib/mode/stats4.jar b/lib/mode/stats4.jar
diff --git a/lib/mode/tools.jar b/lib/mode/tools.jar
diff --git a/lib/mode/utils.jar b/lib/mode/utils.jar
diff --git a/lib/mode/xz.jar b/lib/mode/xz.jar
diff --git a/src/rprocessing/applet/BuiltinApplet.java b/src/rprocessing/applet/BuiltinApplet.java
@@ -1,13 +1,13 @@
 package rprocessing.applet;
 
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-
+import org.renjin.aether.AetherPackageLoader;
+import org.renjin.eval.Session;
+import org.renjin.eval.SessionBuilder;
 import org.renjin.script.RenjinScriptEngine;
+import org.renjin.script.RenjinScriptEngineFactory;
 import org.renjin.sexp.StringVector;
 
 import processing.core.PApplet;
-import rprocessing.exception.NotFoundException;
 
 /**
  * BuiltinApplet is the type to refactor the function calls.
@@ -26,16 +26,11 @@ public RenjinScriptEngine getRenjinEngine() {
     return renjinEngine;
   }
 
-  public BuiltinApplet() throws NotFoundException {
-    // Create a script engine manager.
-    ScriptEngineManager manager = new ScriptEngineManager();
-    // Create a Renjin engine.
-    ScriptEngine engine = manager.getEngineByName("Renjin");
-    // Check if the engine has loaded correctly.
-    if (engine == null) {
-      throw new NotFoundException("Renjin Script Engine not found on the classpath.");
-    }
-    this.renjinEngine = (RenjinScriptEngine) engine;
+  public BuiltinApplet() {
+    AetherPackageLoader packageLoader = new AetherPackageLoader();
+    Session session =
+        new SessionBuilder().withDefaultPackages().setPackageLoader(packageLoader).build();
+    this.renjinEngine = new RenjinScriptEngineFactory().getScriptEngine(session);
   }
 
   public void size(double width, double height) {