From 9b2ffe6e66940683d004da6b2b43d54947ad8932 Mon Sep 17 00:00:00 2001
From: Ryan LaMothe <ryan.lamothe@quantumworx.com>
Date: Sun, 19 Feb 2012 20:05:00 +0000
Subject: [PATCH] Added missing /dist to all build files and execution scripts
---
examples/effects/build.xml | 6 +++---
examples/nbody/build.xml | 6 +++---
examples/nbody/local.bat | 4 ++--
examples/nbody/nbody.bat | 4 ++--
examples/nbody/nbody.sh | 4 ++--
samples/blackscholes/blackscholes.sh | 4 ++--
samples/blackscholes/build.xml | 2 +-
samples/convolution/build.xml | 2 +-
samples/convolution/conv.bat | 4 ++--
samples/life/build.xml | 2 +-
samples/life/life.bat | 4 ++--
samples/life/life.sh | 4 ++--
samples/mandel/build.xml | 2 +-
samples/mandel/mandel.bat | 4 ++--
samples/mandel/mandel.sh | 4 ++--
samples/mandel/mandel2D.bat | 4 ++--
samples/mandel/mandel2D.sh | 4 ++--
samples/squares/build.xml | 2 +-
samples/squares/squares.bat | 4 ++--
samples/squares/squares.sh | 4 ++--
20 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/examples/effects/build.xml b/examples/effects/build.xml
index 9366c791..7874c120 100644
--- a/examples/effects/build.xml
+++ b/examples/effects/build.xml
@@ -3,7 +3,7 @@
<project name="effects" default="build" basedir=".">
<path id="compiler.class.path">
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</path>
<path id="runtime.class.path" cache="true">
@@ -27,7 +27,7 @@
<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"/>
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist"/>
<sysproperty key="com.amd.aparapi.executionMode" value="GPU"/>
</java>
</target>
@@ -35,7 +35,7 @@
<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"/>
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist"/>
<sysproperty key="com.amd.aparapi.executionMode" value="JTP"/>
</java>
</target>
diff --git a/examples/nbody/build.xml b/examples/nbody/build.xml
index eaa5927e..3b4fee45 100644
--- a/examples/nbody/build.xml
+++ b/examples/nbody/build.xml
@@ -4,7 +4,7 @@
<property name="jogamp-jar-url" value="http://jogamp.org/deployment/archive/rc/gluegen_28-joal_17-jogl_41-jocl_25/jar/"/>
<path id="compiler.class.path">
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
<pathelement path="jogamp/jogl.all.jar"/>
<pathelement path="jogamp/gluegen-rt.jar"/>
</path>
@@ -150,7 +150,7 @@
<target name="run-jtp">
<java classname="com.amd.aparapi.examples.nbody.Main" fork="true">
<classpath refid="runtime.class.path"/>
- <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni;jogamp"/>
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist;jogamp"/>
<sysproperty key="com.amd.aparapi.executionMode" value="JTP"/>
<sysproperty key="bodies" value="16384"/>
<sysproperty key="height" value="800"/>
@@ -161,7 +161,7 @@
<target name="run-gpu">
<java classname="com.amd.aparapi.examples.nbody.Main" fork="true">
<classpath refid="runtime.class.path"/>
- <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni;jogamp"/>
+ <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist;jogamp"/>
<sysproperty key="com.amd.aparapi.executionMode" value="GPU"/>
<sysproperty key="bodies" value="16384"/>
<sysproperty key="height" value="800"/>
diff --git a/examples/nbody/local.bat b/examples/nbody/local.bat
index 9fe4eb04..5b0611b4 100644
--- a/examples/nbody/local.bat
+++ b/examples/nbody/local.bat
@@ -1,14 +1,14 @@
@echo off
java ^
- -Djava.library.path=..\..\com.amd.aparapi.jni;jogamp ^
+ -Djava.library.path=..\..\com.amd.aparapi.jni\dist;jogamp ^
-Dcom.amd.aparapi.executionMode=%1 ^
-Dcom.amd.aparapi.enableShowGeneratedOpenCL=true ^
-Dcom.amd.aparapi.enableVerboseJNI=false ^
-Dbodies=%2 ^
-Dheight=600 ^
-Dwidth=600 ^
- -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\aparapi.jar;nbody.jar ^
+ -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;nbody.jar ^
com.amd.aparapi.examples.nbody.Local
diff --git a/examples/nbody/nbody.bat b/examples/nbody/nbody.bat
index e5bd4180..d125428f 100644
--- a/examples/nbody/nbody.bat
+++ b/examples/nbody/nbody.bat
@@ -1,12 +1,12 @@
@echo off
java ^
- -Djava.library.path=..\..\com.amd.aparapi.jni;jogamp ^
+ -Djava.library.path=..\..\com.amd.aparapi.jni\dist;jogamp ^
-Dcom.amd.aparapi.executionMode=%1 ^
-Dbodies=%2 ^
-Dheight=600 ^
-Dwidth=600 ^
- -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\aparapi.jar;nbody.jar ^
+ -classpath jogamp\gluegen-rt.jar;jogamp\jogl.all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;nbody.jar ^
com.amd.aparapi.examples.nbody.Main
diff --git a/examples/nbody/nbody.sh b/examples/nbody/nbody.sh
index 63af264e..5e3ada39 100644
--- a/examples/nbody/nbody.sh
+++ b/examples/nbody/nbody.sh
@@ -1,10 +1,10 @@
java \
- -Djava.library.path=../../com.amd.aparapi.jni:jogamp \
+ -Djava.library.path=../../com.amd.aparapi.jni/dist:jogamp \
-Dcom.amd.aparapi.executionMode=$1 \
-Dbodies=$1 \
-Dheight=600 \
-Dwidth=600 \
- -classpath jogamp/jogl.all.jar:jogamp/gluegen-rt.jar:../../com.amd.aparapi/aparapi.jar:nbody.jar \
+ -classpath jogamp/jogl.all.jar:jogamp/gluegen-rt.jar:../../com.amd.aparapi/dist/aparapi.jar:nbody.jar \
com.amd.aparapi.examples.nbody.Main
diff --git a/samples/blackscholes/blackscholes.sh b/samples/blackscholes/blackscholes.sh
index f45b682a..abf0f0a6 100644
--- a/samples/blackscholes/blackscholes.sh
+++ b/samples/blackscholes/blackscholes.sh
@@ -1,7 +1,7 @@
java \
- -Djava.library.path=..\..\com.amd.aparapi.jni \
+ -Djava.library.path=..\..\com.amd.aparapi.jni\dist \
-Dcom.amd.aparapi.executionMode=$1 \
-Dsize=$2 \
-Diterations=$3 \
- -classpath blackscholes.jar:..\..\com.amd.aparapi\aparapi.jar \
+ -classpath blackscholes.jar:..\..\com.amd.aparapi\dist\aparapi.jar \
com.amd.aparapi.samples.blackscholes.Main
diff --git a/samples/blackscholes/build.xml b/samples/blackscholes/build.xml
index 4b368168..14ac01d6 100644
--- a/samples/blackscholes/build.xml
+++ b/samples/blackscholes/build.xml
@@ -6,7 +6,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/convolution/build.xml b/samples/convolution/build.xml
index 90979e33..d5d2018b 100644
--- a/samples/convolution/build.xml
+++ b/samples/convolution/build.xml
@@ -5,7 +5,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/convolution/conv.bat b/samples/convolution/conv.bat
index ac0c4aab..f6a9b3b0 100644
--- a/samples/convolution/conv.bat
+++ b/samples/convolution/conv.bat
@@ -1,6 +1,6 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;convolution.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;convolution.jar ^
com.amd.aparapi.sample.convolution.Main
diff --git a/samples/life/build.xml b/samples/life/build.xml
index 3f18acb6..a64631df 100644
--- a/samples/life/build.xml
+++ b/samples/life/build.xml
@@ -5,7 +5,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/life/life.bat b/samples/life/life.bat
index 4a35d22f..09c28c5b 100644
--- a/samples/life/life.bat
+++ b/samples/life/life.bat
@@ -1,7 +1,7 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;life.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;life.jar ^
com.amd.aparapi.sample.life.Main
diff --git a/samples/life/life.sh b/samples/life/life.sh
index b8c0038b..9cf1daf1 100644
--- a/samples/life/life.sh
+++ b/samples/life/life.sh
@@ -1,5 +1,5 @@
java\
- -Djava.library.path=../../com.amd.aparapi.jni\
+ -Djava.library.path=../../com.amd.aparapi.jni/dist\
-Dcom.amd.aparapi.executionMode=$1\
- -classpath ../../com.amd.aparapi/aparapi.jar:life.jar\
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:life.jar\
com.amd.aparapi.sample.life.Main
diff --git a/samples/mandel/build.xml b/samples/mandel/build.xml
index 32878ce6..046dfb00 100644
--- a/samples/mandel/build.xml
+++ b/samples/mandel/build.xml
@@ -5,7 +5,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/mandel/mandel.bat b/samples/mandel/mandel.bat
index 294092c6..daadd488 100644
--- a/samples/mandel/mandel.bat
+++ b/samples/mandel/mandel.bat
@@ -1,7 +1,7 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;mandel.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;mandel.jar ^
com.amd.aparapi.sample.mandel.Main
diff --git a/samples/mandel/mandel.sh b/samples/mandel/mandel.sh
index 8b9bd527..892969df 100644
--- a/samples/mandel/mandel.sh
+++ b/samples/mandel/mandel.sh
@@ -1,5 +1,5 @@
java\
- -Djava.library.path=../../com.amd.aparapi.jni\
+ -Djava.library.path=../../com.amd.aparapi.jni/dist\
-Dcom.amd.aparapi.executionMode=$1\
- -classpath ../../com.amd.aparapi/aparapi.jar:mandel.jar\
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:mandel.jar\
com.amd.aparapi.sample.mandel.Main
diff --git a/samples/mandel/mandel2D.bat b/samples/mandel/mandel2D.bat
index 93e67e07..a3825670 100644
--- a/samples/mandel/mandel2D.bat
+++ b/samples/mandel/mandel2D.bat
@@ -1,7 +1,7 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;mandel.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;mandel.jar ^
com.amd.aparapi.sample.mandel.Main2D
diff --git a/samples/mandel/mandel2D.sh b/samples/mandel/mandel2D.sh
index 99a1c45c..238ab197 100644
--- a/samples/mandel/mandel2D.sh
+++ b/samples/mandel/mandel2D.sh
@@ -1,5 +1,5 @@
java\
- -Djava.library.path=../../com.amd.aparapi.jni\
+ -Djava.library.path=../../com.amd.aparapi.jni/dist\
-Dcom.amd.aparapi.executionMode=$1\
- -classpath ../../com.amd.aparapi/aparapi.jar:mandel.jar\
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:mandel.jar\
com.amd.aparapi.sample.mandel.Main2D
diff --git a/samples/squares/build.xml b/samples/squares/build.xml
index 291ebc9d..df44d67b 100644
--- a/samples/squares/build.xml
+++ b/samples/squares/build.xml
@@ -5,7 +5,7 @@
<mkdir dir="classes"/>
<javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
<classpath>
- <pathelement path="../../com.amd.aparapi/aparapi.jar"/>
+ <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
</classpath>
</javac>
<jar jarfile="${ant.project.name}.jar" basedir="classes"/>
diff --git a/samples/squares/squares.bat b/samples/squares/squares.bat
index b18ef57f..9e45a96d 100644
--- a/samples/squares/squares.bat
+++ b/samples/squares/squares.bat
@@ -1,6 +1,6 @@
java ^
- -Djava.library.path=../../com.amd.aparapi.jni ^
+ -Djava.library.path=../../com.amd.aparapi.jni/dist ^
-Dcom.amd.aparapi.executionMode=%1 ^
- -classpath ../../com.amd.aparapi/aparapi.jar;squares.jar ^
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar;squares.jar ^
com.amd.aparapi.sample.squares.Main
diff --git a/samples/squares/squares.sh b/samples/squares/squares.sh
index 9e086eb7..3fe88051 100644
--- a/samples/squares/squares.sh
+++ b/samples/squares/squares.sh
@@ -1,5 +1,5 @@
java \
- -Djava.library.path=../../com.amd.aparapi.jni \
+ -Djava.library.path=../../com.amd.aparapi.jni/dist \
-Dcom.amd.aparapi.executionMode=%1 \
- -classpath ../../com.amd.aparapi/aparapi.jar:squares.jar \
+ -classpath ../../com.amd.aparapi/dist/aparapi.jar:squares.jar \
com.amd.aparapi.sample.squares.Main
--
GitLab