From af59840baf13f085fb9695e5b13a3f69230af08a Mon Sep 17 00:00:00 2001
From: Gary Frost <frost.gary@gmail.com>
Date: Mon, 31 Dec 2012 17:55:01 +0000
Subject: [PATCH] cleanup jogamp move
---
examples/javaonedemo/build.xml | 4 +-
examples/javaonedemo/nbody.bat | 4 +-
examples/javaonedemo/nbody.sh | 12 +-
examples/nbody/nbody.sh | 2 +-
.../get-jogamp-build.xml | 0
examples/third-party/get-jogl.xml | 204 ------------------
6 files changed, 7 insertions(+), 219 deletions(-)
rename examples/{javaonedemo => third-party}/get-jogamp-build.xml (100%)
delete mode 100644 examples/third-party/get-jogl.xml
diff --git a/examples/javaonedemo/build.xml b/examples/javaonedemo/build.xml
index 8ccee70e..4b4a8711 100644
--- a/examples/javaonedemo/build.xml
+++ b/examples/javaonedemo/build.xml
@@ -4,8 +4,8 @@
<path id="compiler.class.path">
<pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
- <pathelement path="jogamp/jogl-all.jar"/>
- <pathelement path="jogamp/gluegen-rt.jar"/>
+ <pathelement path="../third-party/jogamp/jogl-all.jar"/>
+ <pathelement path="../third-party/jogamp/gluegen-rt.jar"/>
</path>
<path id="runtime.class.path" cache="true">
diff --git a/examples/javaonedemo/nbody.bat b/examples/javaonedemo/nbody.bat
index a8fd8d4a..00927050 100644
--- a/examples/javaonedemo/nbody.bat
+++ b/examples/javaonedemo/nbody.bat
@@ -1,7 +1,7 @@
@echo off
java ^
- -Djava.library.path=..\..\com.amd.aparapi.jni\dist;jogamp\windows-%PROCESSOR_ARCHITECTURE% ^
- -classpath jogamp\gluegen-rt.jar;jogamp\jogl-all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;javaonedemo.jar ^
+ -Djava.library.path=..\..\com.amd.aparapi.jni\dist;..\third-party\jogamp\windows-%PROCESSOR_ARCHITECTURE% ^
+ -classpath ..\third-party\jogamp\gluegen-rt.jar;..\third-party\jogamp\jogl-all.jar;..\..\com.amd.aparapi\dist\aparapi.jar;javaonedemo.jar ^
com.amd.aparapi.examples.javaonedemo.NBody
diff --git a/examples/javaonedemo/nbody.sh b/examples/javaonedemo/nbody.sh
index d3ac3c82..7505a7db 100644
--- a/examples/javaonedemo/nbody.sh
+++ b/examples/javaonedemo/nbody.sh
@@ -1,12 +1,4 @@
#!/bin/bash
-case $(uname -i) in
- x86_64 )
- export ARCH=linux-amd64 ;;
- *)
- export ARCH=linux-i586 ;;
-esac
-
-java \
- -Djava.library.path=../../com.amd.aparapi.jni/dist:jogamp/${ARCH} \
- -classpath jogamp/gluegen-rt.jar:jogamp/jogl-all.jar:../../com.amd.aparapi/dist/aparapi.jar:javaonedemo.jar \
+java -Djava.library.path=../../com.amd.aparapi.jni/dist:../third-party/jogamp \
+ -classpath ../third-party/jogamp/gluegen-rt.jar:../third-party/jogamp/jogl-all.jar:../../com.amd.aparapi/dist/aparapi.jar:javaonedemo.jar \
com.amd.aparapi.examples.javaonedemo.NBody
diff --git a/examples/nbody/nbody.sh b/examples/nbody/nbody.sh
index 579bc834..75289f18 100644
--- a/examples/nbody/nbody.sh
+++ b/examples/nbody/nbody.sh
@@ -2,7 +2,7 @@
java \
-Djava.library.path=../../com.amd.aparapi.jni/dist:../third-party/jogamp \
-Dcom.amd.aparapi.executionMode=$1 \
- -Dbodies=$1 \
+ -Dbodies=$2 \
-Dheight=600 \
-Dwidth=600 \
-classpath ../third-party/jogamp/jogl-all.jar:../third-party/jogamp/gluegen-rt.jar:../../com.amd.aparapi/dist/aparapi.jar:nbody.jar \
diff --git a/examples/javaonedemo/get-jogamp-build.xml b/examples/third-party/get-jogamp-build.xml
similarity index 100%
rename from examples/javaonedemo/get-jogamp-build.xml
rename to examples/third-party/get-jogamp-build.xml
diff --git a/examples/third-party/get-jogl.xml b/examples/third-party/get-jogl.xml
deleted file mode 100644
index def8a4fe..00000000
--- a/examples/third-party/get-jogl.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="nbody" default="build" basedir=".">
- <!--<property name="jogamp-jar-url" value="http://jogamp.org/deployment/archive/rc/gluegen_28-joal_17-jogl_41-jocl_25/jar"/>-->
- <property name="jogamp-jar-url" value="http://jogamp.org/deployment/archive/rc/gluegen_52-joal_32-jogl_66-jocl_41/jar"/>
- <path id="compiler.class.path">
- <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/>
- <pathelement path="jogamp/jogl-all.jar"/>
- <pathelement path="jogamp/gluegen-rt.jar"/>
- </path>
-
- <path id="runtime.class.path" cache="true">
- <path refid="compiler.class.path"/>
- <pathelement path="${ant.project.name}.jar"/>
- </path>
-
- <target name="getjogl-windows-i586" if="use.win32">
- <delete dir="jogamp"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-windows-i586.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-windows-i586.jar"/>
- <url url="${jogamp-jar-url}/jogl-all.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-windows-i586.jar" dest="jogamp"/>
- <unzip src="jogamp/gluegen-rt-natives-windows-i586.jar" dest="jogamp"/>
- <delete dir="jogamp/META-INF"/>
- </target>
-
- <target name="getjogl-windows-amd64" if="use.win64">
- <delete dir="jogamp"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-windows-amd64.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-windows-amd64.jar"/>
- <url url="${jogamp-jar-url}/jogl-all.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-windows-amd64.jar" dest="jogamp"/>
- <unzip src="jogamp/gluegen-rt-natives-windows-amd64.jar" dest="jogamp"/>
- <delete dir="jogamp/META-INF"/>
- </target>
-
- <target name="getjogl-linux-i586" if="use.linux32">
- <delete dir="jogamp"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-linux-i586.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-linux-i586.jar"/>
- <url url="${jogamp-jar-url}/jogl-all.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-linux-i586.jar" dest="jogamp"/>
- <unzip src="jogamp/gluegen-rt-natives-linux-i586.jar" dest="jogamp"/>
- <delete dir="jogamp/META-INF"/>
- </target>
-
- <target name="getjogl-linux-amd64" if="use.linux64">
- <delete dir="jogamp"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-linux-amd64.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-linux-amd64.jar"/>
- <url url="${jogamp-jar-url}/jogl-all.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-linux-amd64.jar" dest="jogamp"/>
- <unzip src="jogamp/gluegen-rt-natives-linux-amd64.jar" dest="jogamp"/>
- <delete dir="jogamp/META-INF"/>
- </target>
-
- <target name="getjogl-mac-universal" if="use.mac.universal">
- <delete dir="jogamp"/>
- <get dest="jogamp">
- <url url="${jogamp-jar-url}/jogl-all-natives-macosx-universal.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt-natives-macosx-universal.jar"/>
- <url url="${jogamp-jar-url}/jogl-all.jar"/>
- <url url="${jogamp-jar-url}/gluegen-rt.jar"/>
- </get>
- <unzip src="jogamp/jogl-all-natives-macosx-universal.jar" dest="jogamp"/>
- <unzip src="jogamp/gluegen-rt-natives-macosx-universal.jar" dest="jogamp"/>
- <delete dir="jogamp/META-INF"/>
- </target>
-
- <target name="checkos">
- <condition property="use.win32">
- <and>
- <os family="windows" />
- <or>
- <os arch="x86" />
- <os arch="i386" />
- </or>
- <not><available file="jogamp/jogl-all-natives-windows-i586.jar"/> </not>
- <not><available file="jogamp/gluegen-rt-natives-windows-i586.jar"/> </not>
- <not><available file="jogamp/jogl-all.jar"/> </not>
- <not><available file="jogamp/gluegen-rt.jar"/> </not>
- </and>
- </condition>
- <condition property="use.win64">
- <and>
- <os family="windows" />
- <not>
- <or>
- <os arch="x86" />
- <os arch="i386" />
- </or>
- </not>
- <not><available file="jogamp/jogl-all-natives-windows-amd64.jar"/> </not>
- <not><available file="jogamp/gluegen-rt-natives-windows-amd64.jar"/> </not>
- <not><available file="jogamp/jogl-all.jar"/> </not>
- <not><available file="jogamp/gluegen-rt.jar"/> </not>
- </and>
- </condition>
- <condition property="use.linux32">
- <and>
- <os family="unix" />
- <not>
- <os family="mac" />
- </not>
- <or>
- <os arch="x86" />
- <os arch="i386" />
- </or>
- <not><available file="jogamp/jogl-all-natives-linux-i586.jar"/> </not>
- <not><available file="jogamp/gluegen-rt-natives-linux-i586.jar"/> </not>
- <not><available file="jogamp/jogl-all.jar"/> </not>
- <not><available file="jogamp/gluegen-rt.jar"/> </not>
- </and>
- </condition>
- <condition property="use.linux64">
- <and>
- <os family="unix" />
- <not>
- <os family="mac" />
- </not>
- <not>
- <or>
- <os arch="x86" />
- <os arch="i386" />
- </or>
- </not>
- <not><available file="jogamp/jogl-all-natives-linux-amd64.jar"/> </not>
- <not><available file="jogamp/gluegen-rt-natives-linux-amd64.jar"/> </not>
- <not><available file="jogamp/jogl-all.jar"/> </not>
- <not><available file="jogamp/gluegen-rt.jar"/> </not>
- </and>
- </condition>
- <condition property="use.mac.universal">
- <and>
- <os family="mac" />
- <not>
- <or>
- <os arch="x86" />
- <os arch="i386" />
- </or>
- </not>
- <not><available file="jogamp/jogl-all-natives-macosx-universal.jar"/> </not>
- <not><available file="jogamp/gluegen-rt-natives-macosx-universal.jar"/> </not>
- <not><available file="jogamp/jogl-all.jar"/> </not>
- <not><available file="jogamp/gluegen-rt.jar"/> </not>
- </and>
- </condition>
- </target>
-
- <target name="getjogl" depends="checkos, getjogl-windows-i586, getjogl-windows-amd64,
- getjogl-linux-i586, getjogl-linux-amd64, getjogl-mac-universal"/>
-
- <target name="build" depends="clean, getjogl">
- <mkdir dir="classes"/>
- <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false">
- <classpath refid="compiler.class.path"/>
- </javac>
- <copy todir="classes/com/amd/aparapi/examples/nbody" file="src/com/amd/aparapi/examples/nbody/particle.jpg"/>
- <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.examples.nbody.Main" fork="true">
- <classpath refid="runtime.class.path"/>
- <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"/>
- <sysproperty key="width" value="800"/>
- </java>
- </target>
-
- <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\dist;jogamp"/>
- <sysproperty key="com.amd.aparapi.executionMode" value="GPU"/>
- <sysproperty key="bodies" value="16384"/>
- <sysproperty key="height" value="800"/>
- <sysproperty key="width" value="800"/>
- </java>
- </target>
-
- <target name="run" depends="run-gpu"/>
-
-
-</project>
--
GitLab