diff options
| -rw-r--r-- | build.xml | 19 | ||||
| -rw-r--r-- | demo-template.jnlp | 2 | ||||
| -rw-r--r-- | nbproject/configs/CLInfo.properties | 1 |
3 files changed, 19 insertions, 3 deletions
@@ -21,20 +21,30 @@ <antcall target="create-jnlp" inheritrefs="true"> <param name="jnlp.name" value="glclinterop"/> <param name="jnlp.title" value="JOGL - JOCL interoperability example."/> + <param name="jnlp.jogl" value="true"/> <param name="jnlp.mainclass" value="com.jogamp.opencl.demos.joglinterop.GLCLInteroperabilityDemo"/> </antcall> <antcall target="create-jnlp" inheritrefs="true"> <param name="jnlp.name" value="julia3d"/> <param name="jnlp.title" value="3D Julia Set Fractal demo."/> + <param name="jnlp.jogl" value="true"/> <param name="jnlp.mainclass" value="com.jogamp.opencl.demos.julia3d.Julia3d"/> </antcall> <antcall target="create-jnlp" inheritrefs="true"> - <param name="jnlp.name" value="multidevicefractal"/> + <param name="jnlp.name" value="multi-device-fractal"/> <param name="jnlp.title" value="Multi Device Mandelbrot Fractal example."/> + <param name="jnlp.jogl" value="true"/> <param name="jnlp.mainclass" value="com.jogamp.opencl.demos.fractal.MultiDeviceFractal"/> </antcall> + + <antcall target="create-jnlp" inheritrefs="true"> + <param name="jnlp.name" value="clinfo"/> + <param name="jnlp.title" value="OpenCL diagnostics."/> + <param name="jnlp.jogl" value="false"/> + <param name="jnlp.mainclass" value="com.jogamp.opencl.demos.info.CLInfo"/> + </antcall> </target> @@ -46,6 +56,11 @@ </target> <target name="create-jnlp"> + <condition property="jogl.extension" + value='<extension name="jogl-all-awt" href="http://jogamp.org/deployment/webstart-next/jogl-all-awt.jnlp"/>' + else=""> + <istrue value="${jnlp.jogl}"/> + </condition> <copy file="demo-template.jnlp" tofile="${dist.jar.dir}/${jnlp.name}.jnlp"> <filterchain> <replacestring from="DEMO_TITLE" to="${jnlp.title}"/> @@ -53,7 +68,7 @@ <replacestring from="CLASS_TAG" to="${jnlp.mainclass}"/> <replacestring from="DEMO_CODEBASE_TAG" to="${jocl-demos.codepase}/"/> <replacestring from="JOCL_CODEBASE_TAG" to="${jocl.codepase}"/> - <replacestring from="JOGL_CODEBASE_TAG" to="http://jogamp.org/deployment/webstart-next"/> + <replacestring from="EXTENSION" to="${jogl.extension}"/> </filterchain> </copy> </target> diff --git a/demo-template.jnlp b/demo-template.jnlp index 16ba968..42ff928 100644 --- a/demo-template.jnlp +++ b/demo-template.jnlp @@ -15,7 +15,7 @@ <property name="sun.java2d.noddraw" value="true"/> <jar href="jocl-demos.jar" main="true"/> <extension name="jocl" href="JOCL_CODEBASE_TAG/jocl.jnlp" /> - <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" /> + EXTENSION </resources> <application-desc main-class="CLASS_TAG"/> diff --git a/nbproject/configs/CLInfo.properties b/nbproject/configs/CLInfo.properties new file mode 100644 index 0000000..3282d5b --- /dev/null +++ b/nbproject/configs/CLInfo.properties @@ -0,0 +1 @@ +main.class=com.jogamp.opencl.demos.info.CLInfo |