From b80e04d54751254e613be16750e532553152434e Mon Sep 17 00:00:00 2001
From: "Ryan R. LaMothe" <Ryan.LaMothe@pnnl.gov>
Date: Fri, 26 Sep 2014 15:24:01 -0700
Subject: [PATCH] Added ability to build and execute 'add' from Ant
---
samples/add/.classpath | 23 ++++++++--------
samples/add/.gitignore | 1 +
samples/add/build.xml | 61 ++++++++++++++++++++++++++++++++----------
3 files changed, 59 insertions(+), 26 deletions(-)
create mode 100644 samples/add/.gitignore
diff --git a/samples/add/.classpath b/samples/add/.classpath
index d0b04da9..253bb278 100644
--- a/samples/add/.classpath
+++ b/samples/add/.classpath
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
diff --git a/samples/add/.gitignore b/samples/add/.gitignore
new file mode 100644
index 00000000..840e7d31
--- /dev/null
+++ b/samples/add/.gitignore
@@ -0,0 +1 @@
+/classes/
diff --git a/samples/add/build.xml b/samples/add/build.xml
index 2b0d1eee..2653e3c1 100644
--- a/samples/add/build.xml
+++ b/samples/add/build.xml
@@ -1,20 +1,53 @@
<?xml version="1.0"?>
<project name="add" default="build" basedir=".">
- <target name="build" depends="clean">
- <mkdir dir="classes"/>
- <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
- <classpath>
- <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
- </classpath>
- </javac>
- <jar jarfile="${ant.project.name}.jar" basedir="classes"/>
- </target>
-
- <target name="clean">
- <delete dir="classes"/>
- <delete file="${ant.project.name}.jar"/>
- </target>
+ <!-- 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>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar" />
+ </classpath>
+ </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-jtp">
+ <java classname="com.amd.aparapi.sample.add.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-gpu">
+ <java classname="com.amd.aparapi.sample.add.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" depends="run-gpu" />
</project>
--
GitLab