ant: Fall back to core directory

Signed-off-by: Ce Gao <[email protected]>

Author: gaocegege

build.xml.template

@@ -3,14 +3,14 @@
     <property name="mode.name" value="RLangMode" />
 
     <!-- folder to install modes in (probably a folder called "modes" inside your sketchbook folder) -->
-    <property name="processing.modes" location="@@modes@@" />
+    <property name="processing.modes" value="@@modes@@" />
 
     <!-- path to your processing executable. -->
-    <property name="processing.executable" location="@@executable@@" />
+    <property name="processing.executable" value="@@executable@@" />
 
     <!-- location of processing jars (core.jar, pde.jar, ..) -->
-    <property name="processing.classes.core" location="@@core@@" />
-    <property name="processing.classes.pde" location="@@pde@@" />
+    <property name="processing.classes.core" value="@@core@@" />
+    <property name="processing.classes.pde" value="@@pde@@" />
     <property name="renjin" value="@@renjin@@" />
     <property name="java.target.version" value="1.8" />
 
@@ -30,8 +30,10 @@
     <property name="result.exec.file" location="${test.build.dir}/jacoco.exec"/>
 
     <path id="library-classpath">
-        <pathelement location="${processing.classes.core}"/>
         <pathelement location="${processing.classes.pde}"/>
+        <fileset dir="${processing.classes.core}">
+            <include name="*.jar" />
+        </fileset>
         <fileset dir="lib">
             <include name="*.jar" />
         </fileset>
@@ -69,7 +71,7 @@
             <manifest>
                 <attribute name="Main-Class" value="rprocessing.Runner" />
             </manifest>
-            <zipgroupfileset file="${processing.classes.core}" includes="${processing.classes.core}" />
+            <zipgroupfileset dir="${processing.classes.core}" includes="*.jar" />
             <zipgroupfileset dir="${lib}" includes="**/*.jar" />
         </jar>
     </target>

raw-docs/howto.md

@@ -30,9 +30,9 @@ Configure `./scripts/generate-ant-file.sh`:
    -  MacOSX: `/Users/[MyUserName]/Documents/Processing/modes/`
    -  Windows: `%homepath%\Documents\modes\`
    -  Linux: `${HOME}/sketchbook/modes/`
-- `core` and `pde`: paths to pde.jar and core.jar. They are be used to build RLangMode.
-   -  MacOSX: `/Applications/Processing.app/Contents/Java/core.jar` and `/Applications/Processing.app/Contents/Java/pde.jar`
-   -  Linux: `[MyPDE]/core/library/core.jar` and `[MyPDE]/lib/pde.jar`
+- `core` and `pde`: paths to core library and pde.jar. They are be used to build runner and run test cases.
+   -  MacOSX: `/Applications/Processing.app/Contents/Java/core/library` and `/Applications/Processing.app/Contents/Java/pde.jar`
+   -  Linux: `[MyPDE]/core/library` and `[MyPDE]/lib/pde.jar`
 - `executable`: optional argument giving the location of PDE.
    -  The path is used in `ant run` to start a PDE instance. Leave blank to not launch PDE on `ant run`.
    -  MacOSX: `/Applications/Processing.app/Contents/MacOS/Processing`
@@ -44,8 +44,8 @@ For example, to install the mode into a default existing PDE app on a MacOS syst
 
 ```
 modes="/Users/[MyUserName]/Documents/Processing/modes"
-core="/Applications/Processing.app/Contents/Java/"
-pde="/Applications/Processing.app/Contents/Java/"
+core="/Applications/Processing.app/Contents/Java/core/library"
+pde="/Applications/Processing.app/Contents/Java/pde.jar"
 executable="/Applications/Processing.app/Contents/MacOS/Processing"
 ```
 
@@ -67,7 +67,7 @@ Then set the two paths accordingly in `./scripts/generate-ant-file.sh`:
 ```
 modes="${HOME}/Documents/Processing/modes"
 core="../processing/core/library/"
-pde="../processing/app/"
+pde="../processing/app/pde.jar"
 executable="/Applications/Processing.app/Contents/MacOS/Processing"
 ```
 

scripts/generate-ant-file.sh

@@ -5,7 +5,7 @@ source "$(dirname "${BASH_SOURCE}")/utils/generator-util.sh"
 # Path to be changed
 modes="${HOME}/Documents/Processing/modes"
 executable="/Applications/Processing.app/Contents/MacOS/Processing"
-core="/Applications/Processing.app/Contents/Java/core.jar"
+core="/Applications/Processing.app/Contents/Java/core/library"
 pde="/Applications/Processing.app/Contents/Java/pde.jar"
 
 # Call functions in utils/generator-util.sh

scripts/utils/generator-util.sh

@@ -9,13 +9,14 @@ function log {
 }
 
 function help {
-  log "There are 4 paths needed: mode directory, path to executable, path to core.jar, and path to pde.jar."
+  log "There are 4 paths needed: mode directory, path to executable, path to core.jar directory and path to pde.jar."
 }
 
 function generate-build-config {
+  local numberOfParams=4
   local root=$(dirname "${BASH_SOURCE}")/../..
 
-  if [[ $# -ne 4 ]]; then
+  if [[ $# -ne ${numberOfParams} ]]; then
     log "The number of parameters is $#, which does not match ${FUNCNAME} in ${BASH_SOURCE}."
     help
     exit 1