more generic, cleaning up dirs

benfry · benfry · commit 87f21903477e · 2016-09-20T15:15:23.000-04:00
diff --git a/build/jre/build.xml b/build/jre/build.xml
@@ -2,12 +2,15 @@
 
   <target name="compile">
     <mkdir dir="bin" />
+
+    <!-- Where can I expect to find Java Mode JARs? -->
+    <property name="java.mode" value="../../java/mode/" />
     
     <!-- Check for JDT compiler, since this is likely a PDE build. Using
 	 it allows us to build the PDE with only a JRE on Windows and Linux.
 	 So that the core can be built independently of the PDE, 
 	 use javac (the "modern" compiler) if ecj is not present. -->
-    <property name="jdt.jar" value="../java/mode/org.eclipse.jdt.core.jar" />
+    <property name="jdt.jar" value="${java.mode}/org.eclipse.jdt.core.jar" />
     <condition property="build.compiler" 
 	       value="org.eclipse.jdt.core.JDTCompilerAdapter"
 	       else="modern">
@@ -22,7 +25,8 @@
 	   debug="true" 
 	   includeantruntime="true"
 	   nowarn="true">
-      <compilerclasspath path="${jdt.jar}; ../../java/mode/jdtCompilerAdapter.jar" />
+      <!-- kinda gross, but if not using the JDT, this just ignored anyway -->
+      <compilerclasspath path="${jdt.jar}; ${java.mode}/jdtCompilerAdapter.jar" />
     </javac>
   </target>
   
diff --git a/core/build.xml b/core/build.xml
@@ -20,11 +20,14 @@
 	     classpath="methods/methods.jar" />
     <methods dir="${basedir}/src/processing/core" recorder="true" />
 
+    <!-- Where can I expect to find Java Mode JARs? -->
+    <property name="java.mode" value="../java/mode/" />
+        
     <!-- Check for JDT compiler, since this is likely a PDE build. Using
 	 it allows us to build the PDE with only a JRE on Windows and Linux.
 	 So that the core can be built independently of the PDE, 
 	 use javac (the "modern" compiler) if ecj is not present. -->
-    <property name="jdt.jar" value="../java/mode/org.eclipse.jdt.core.jar" />
+    <property name="jdt.jar" value="${java.mode}/org.eclipse.jdt.core.jar" />
     <condition property="build.compiler" 
 	       value="org.eclipse.jdt.core.JDTCompilerAdapter"
 	       else="modern">
@@ -50,7 +53,7 @@
                       library/gluegen-rt.jar"
 	   nowarn="true">
       <!-- kinda gross, but if not using the JDT, this just ignored anyway -->
-      <compilerclasspath path="${jdt.jar}; ../java/mode/jdtCompilerAdapter.jar" />
+      <compilerclasspath path="${jdt.jar}; ${java.mode}/jdtCompilerAdapter.jar" />
       <src path="src" />
       <include name="processing/**" />
       <exclude name="processing/javafx/**" if="fx.unavailable" />
