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]>

Author: gaocegege

.gitignore

@@ -15,7 +15,7 @@ build.number
 # Processing.R
 bin/
 dist/
-build/
+/build/
 try/
 *.log
 build.xml

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}">

lib/build/maven-ant-tasks-2.1.3.jar

@@ -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>

lib/mode/aether-api.jar

@@ -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) {