From bf202e8e104d4e8802043468901d49a58afb3801 Mon Sep 17 00:00:00 2001
From: "Ryan R. LaMothe" <Ryan.LaMothe@pnnl.gov>
Date: Fri, 26 Sep 2014 21:09:32 -0700
Subject: [PATCH] Adjusted build.xml to work with Java 7. Pruned Eclipse
 classpath.

---
 examples/effects/.classpath |  1 -
 examples/effects/build.xml  | 82 ++++++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/examples/effects/.classpath b/examples/effects/.classpath
index 43bd144c..253bb278 100644
--- a/examples/effects/.classpath
+++ b/examples/effects/.classpath
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="/com.amd.aparapi/dist/aparapi.jar" sourcepath="/com.amd.aparapi">
 		<attributes>
 			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.amd.aparapi.jni/dist"/>
diff --git a/examples/effects/build.xml b/examples/effects/build.xml
index 7874c120..af1f3367 100644
--- a/examples/effects/build.xml
+++ b/examples/effects/build.xml
@@ -2,43 +2,49 @@
 
 <project name="effects" default="build" basedir=".">
 
-   <path id="compiler.class.path">
-      <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
-   </path>
-
-   <path id="runtime.class.path" cache="true">
-      <path refid="compiler.class.path"/>
-      <pathelement path="${ant.project.name}.jar"/>
-   </path>
-
-   <target name="build" depends="clean">
-      <mkdir dir="classes"/>
-      <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false">
-         <classpath refid="compiler.class.path"/>
-      </javac>
-      <jar jarfile="${ant.project.name}.jar" basedir="classes"/>
-   </target>
-
-   <target name="clean">
-      <delete dir="classes"/>
-      <delete file="${ant.project.name}.jar"/>
-   </target>
-
-   <target name="run-gpu" >
-      <java classname="com.amd.aparapi.examples.effects.Main" fork="true">
-         <classpath refid="runtime.class.path"/>
-         <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist"/>
-         <sysproperty key="com.amd.aparapi.executionMode" value="GPU"/>
-      </java>
-   </target>
-
-   <target name="run-jtp" >
-      <java classname="com.amd.aparapi.examples.effects.Main" fork="true">
-         <classpath refid="runtime.class.path"/>
-         <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist"/>
-         <sysproperty key="com.amd.aparapi.executionMode" value="JTP"/>
-      </java>
-   </target>
-   <target name="run" depends="run-gpu"/>
+	<!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
+	<!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
+	<property name="build.compiler" value="javac1.7" />
+	<property name="ant.build.javac.source" value="1.7" />
+	<property name="ant.build.javac.target" value="1.7" />
+
+	<path id="compiler.class.path">
+		<pathelement path="../../com.amd.aparapi/dist/aparapi.jar" />
+	</path>
+
+	<path id="runtime.class.path" cache="true">
+		<path refid="compiler.class.path" />
+		<pathelement path="${ant.project.name}.jar" />
+	</path>
+
+	<target name="build" depends="clean">
+		<mkdir dir="classes" />
+		<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false">
+			<classpath refid="compiler.class.path" />
+		</javac>
+		<jar jarfile="${ant.project.name}.jar" basedir="classes" />
+	</target>
+
+	<target name="clean">
+		<delete dir="classes" />
+		<delete file="${ant.project.name}.jar" />
+	</target>
+
+	<target name="run-gpu">
+		<java classname="com.amd.aparapi.examples.effects.Main" fork="true">
+			<classpath refid="runtime.class.path" />
+			<sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist" />
+			<sysproperty key="com.amd.aparapi.executionMode" value="GPU" />
+		</java>
+	</target>
+
+	<target name="run-jtp">
+		<java classname="com.amd.aparapi.examples.effects.Main" fork="true">
+			<classpath refid="runtime.class.path" />
+			<sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist" />
+			<sysproperty key="com.amd.aparapi.executionMode" value="JTP" />
+		</java>
+	</target>
+	<target name="run" depends="run-gpu" />
 
 </project>
-- 
GitLab