diff options
-rw-r--r-- | jnlp-files/applet-gears-launcheronly.html | 8 | ||||
-rw-r--r-- | jnlp-files/applet-gears.html | 8 | ||||
-rw-r--r-- | jnlp-files/applet-gearsjoal-launcheronly.html | 8 | ||||
-rw-r--r-- | jnlp-files/applet-gearsjoal.html | 8 | ||||
-rw-r--r-- | jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html | 4 | ||||
-rw-r--r-- | jnlp-files/jogl-newt-applet-runner-cube.html | 4 | ||||
-rw-r--r-- | jnlp-files/jogl-newt-applet-runner-fbcubes.html | 4 | ||||
-rw-r--r-- | jnlp-files/jogl-newt-applet-runner-gears.html | 4 | ||||
-rw-r--r-- | make/build.xml | 40 |
9 files changed, 44 insertions, 44 deletions
diff --git a/jnlp-files/applet-gears-launcheronly.html b/jnlp-files/applet-gears-launcheronly.html index 6193df3..04a1ce3 100644 --- a/jnlp-files/applet-gears-launcheronly.html +++ b/jnlp-files/applet-gears-launcheronly.html @@ -25,7 +25,7 @@ as an applet: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="demos.applets.GearsApplet"> @@ -43,7 +43,7 @@ as an applet: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar" codebase_lookup="false" subapplet.classname="demos.applets.GearsApplet" @@ -70,7 +70,7 @@ The applet above is instantiated with the following code: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="demos.applets.GearsApplet"> @@ -88,7 +88,7 @@ The applet above is instantiated with the following code: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar" codebase_lookup="false" subapplet.classname="demos.applets.GearsApplet" diff --git a/jnlp-files/applet-gears.html b/jnlp-files/applet-gears.html index 8fe78eb..df5f207 100644 --- a/jnlp-files/applet-gears.html +++ b/jnlp-files/applet-gears.html @@ -26,7 +26,7 @@ JNLP applet's one. <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="demos.applets.GearsApplet"> @@ -44,7 +44,7 @@ JNLP applet's one. pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar" codebase_lookup="false" subapplet.classname="demos.applets.GearsApplet" @@ -72,7 +72,7 @@ The applet above is instantiated with the following code: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="demos.applets.GearsApplet"> @@ -90,7 +90,7 @@ The applet above is instantiated with the following code: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar" codebase_lookup="false" subapplet.classname="demos.applets.GearsApplet" diff --git a/jnlp-files/applet-gearsjoal-launcheronly.html b/jnlp-files/applet-gearsjoal-launcheronly.html index 8706e08..5126f2f 100644 --- a/jnlp-files/applet-gearsjoal-launcheronly.html +++ b/jnlp-files/applet-gearsjoal-launcheronly.html @@ -31,7 +31,7 @@ rendering and OpenAL audio: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, ../jar/joal.jar, jar/jogl-demos.jar"> <param name="codebase_lookup" value="false"> @@ -50,7 +50,7 @@ rendering and OpenAL audio: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, ../jar/joal.jar, jar/jogl-demos.jar" codebase_lookup="false" @@ -78,7 +78,7 @@ The applet above is instantiated with the following code: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, ../jar/joal.jar, jar/jogl-demos.jar"> <param name="codebase_lookup" value="false"> @@ -97,7 +97,7 @@ The applet above is instantiated with the following code: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, ../jar/joal.jar, jar/jogl-demos.jar" codebase_lookup="false" diff --git a/jnlp-files/applet-gearsjoal.html b/jnlp-files/applet-gearsjoal.html index e96aa61..6aeba46 100644 --- a/jnlp-files/applet-gearsjoal.html +++ b/jnlp-files/applet-gearsjoal.html @@ -12,7 +12,7 @@ <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, ../jar/joal.jar, jar/jogl-demos.jar"> <param name="codebase_lookup" value="false"> @@ -32,7 +32,7 @@ pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, ../jar/joal.jar, jar/jogl-demos.jar" codebase_lookup="false" @@ -61,7 +61,7 @@ The applet above is instantiated with the following code: <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"> <param name="archive" value="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, ../jar/joal.jar, jar/jogl-demos.jar"> <param name="codebase_lookup" value="false"> @@ -81,7 +81,7 @@ The applet above is instantiated with the following code: pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/applet-launcher.jar, ../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, ../jar/joal.jar, jar/jogl-demos.jar" codebase_lookup="false" diff --git a/jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html b/jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html index c50aaf0..89fffc3 100644 --- a/jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html +++ b/jnlp-files/jogl-newt-applet-runner-angelesgl2es1.html @@ -11,7 +11,7 @@ width="600" height="400"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar, jar/jogl-demos-util.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> @@ -26,7 +26,7 @@ type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar, jar/jogl-demos-util.jar" java_arguments="-Dsun.java2d.noddraw=true" diff --git a/jnlp-files/jogl-newt-applet-runner-cube.html b/jnlp-files/jogl-newt-applet-runner-cube.html index f04dfcf..6c0c1d8 100644 --- a/jnlp-files/jogl-newt-applet-runner-cube.html +++ b/jnlp-files/jogl-newt-applet-runner-cube.html @@ -11,7 +11,7 @@ width="600" height="400"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar, jar/jogl-demos-util.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> @@ -26,7 +26,7 @@ type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar, jar/jogl-demos-util.jar" java_arguments="-Dsun.java2d.noddraw=true" diff --git a/jnlp-files/jogl-newt-applet-runner-fbcubes.html b/jnlp-files/jogl-newt-applet-runner-fbcubes.html index ef3446e..554ad3b 100644 --- a/jnlp-files/jogl-newt-applet-runner-fbcubes.html +++ b/jnlp-files/jogl-newt-applet-runner-fbcubes.html @@ -11,7 +11,7 @@ width="600" height="400"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar, jar/jogl-demos-util.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> @@ -26,7 +26,7 @@ type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar, jar/jogl-demos-util.jar" java_arguments="-Dsun.java2d.noddraw=true" diff --git a/jnlp-files/jogl-newt-applet-runner-gears.html b/jnlp-files/jogl-newt-applet-runner-gears.html index bb57e32..05a6185 100644 --- a/jnlp-files/jogl-newt-applet-runner-gears.html +++ b/jnlp-files/jogl-newt-applet-runner-gears.html @@ -11,7 +11,7 @@ width="600" height="400"> <param name="code" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"> <param name="archive" value="../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar, jar/jogl-demos-util.jar"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> @@ -26,7 +26,7 @@ type="application/x-java-applet;version=1.6" pluginspage="http://java.sun.com/javase/downloads/ea.jsp" archive="../jar/gluegen-rt.jar, - ../jar/jogl.all.jar, + ../jar/jogl-all.jar, jar/jogl-demos.jar, jar/jogl-demos-util.jar" java_arguments="-Dsun.java2d.noddraw=true" diff --git a/make/build.xml b/make/build.xml index 0c331c1..f2a517f 100644 --- a/make/build.xml +++ b/make/build.xml @@ -51,10 +51,10 @@ - cause builds to fail since if this Java process has the jar file - open we can not overwrite it. --> - <target name="test.for.jogl.demos.jar"> - <available property="jogl.demos.jar.on.class.path" classname="demos.gears.Gears" /> + <target name="test.for.jogl-demos.jar"> + <available property="jogl-demos.jar.on.class.path" classname="demos.gears.Gears" /> </target> - <target name="java.class.path.validate" depends="test.for.jogl.demos.jar" if="jogl.demos.jar.on.class.path"> + <target name="java.class.path.validate" depends="test.for.jogl-demos.jar" if="jogl-demos.jar.on.class.path"> <fail> ****************************************************************** @@ -95,8 +95,8 @@ <target name="init" depends="jogamp.env.init,gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt"> <property name="gluegen-rt.jar" value="${gluegen.build}/gluegen-rt.jar" /> - <property name="jogl.all.jar" value="${jogl.build}/jar/jogl.all.jar" /> - <property name="jogl.cg.jar" value="${jogl.build}/jar/atomic/jogl.cg.jar" /> + <property name="jogl-all.jar" value="${jogl.build}/jar/jogl-all.jar" /> + <property name="jogl-cg.jar" value="${jogl.build}/jar/atomic/jogl-cg.jar" /> <property name="joal.jar" value="${joal.build}/joal.jar" /> <property name="simple-xml.jar" value="${project.root}/lib/simple-xml-1.1.1.jar" /> <property name="classes" value="${build}/classes" /> @@ -106,11 +106,11 @@ <!--property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" /--> <property name="javadoc.link" value="http://docs.oracle.com/javase/6/docs/api/" /> <property name="javadoc.link.jogl" value="${jogl.root}/javadoc-public/" /> - <property name="jogl.demos.jar" value="${build}/jogl-demos.jar" /> - <property name="jogl.demos.util.jar" value="${build}/jogl-demos-util.jar" /> - <property name="jogl.demos.data.jar" value="${build}/jogl-demos-data.jar" /> - <property name="jogl.demos.dualDepthPeeling.jar" value="${build}/jogl-demos-dualDepthPeeling.jar" /> - <property name="jogl.demos.tennis.jar" value="${build}/jogl-demos-tennis.jar" /> + <property name="jogl-demos.jar" value="${build}/jogl-demos.jar" /> + <property name="jogl-demos-util.jar" value="${build}/jogl-demos-util.jar" /> + <property name="jogl-demos-data.jar" value="${build}/jogl-demos-data.jar" /> + <property name="jogl-demos-dualDepthPeeling.jar" value="${build}/jogl-demos-dualDepthPeeling.jar" /> + <property name="jogl-demos-tennis.jar" value="${build}/jogl-demos-tennis.jar" /> <property name="archive.name" value="jogl-demos-${jogl-demos.version}-${os.and.arch}" /> <property name="archive" value="${build}/${archive.name}" /> @@ -160,8 +160,8 @@ <target name="all-desktop" unless="isGLES"> <mkdir dir="${classes}" /> <path id="jogl-demos.classpath"> - <pathelement location="${jogl.all.jar}" /> - <pathelement location="${jogl.cg.jar}" /> + <pathelement location="${jogl-all.jar}" /> + <pathelement location="${jogl-cg.jar}" /> <pathelement location="${joal.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${simple-xml.jar}" /> @@ -181,7 +181,7 @@ </javac> <antcall target="redbook-javac" inheritrefs="true" /> <antcall target="nurbs" inheritrefs="true" /> - <jar destfile="${jogl.demos.jar}"> + <jar destfile="${jogl-demos.jar}"> <fileset dir="${classes}"> <exclude name="gleem/**" /> <exclude name="demos/util/**" /> @@ -207,13 +207,13 @@ <include name="demos/particles/engine/images/*.jpg" /> </fileset> </jar> - <jar destfile="${jogl.demos.util.jar}"> + <jar destfile="${jogl-demos-util.jar}"> <fileset dir="${classes}"> <include name="gleem/**" /> <include name="demos/util/**" /> </fileset> </jar> - <jar destfile="${jogl.demos.data.jar}"> + <jar destfile="${jogl-demos-data.jar}"> <fileset dir="${src}"> <include name="demos/data/**" /> <exclude name="demos/data/models/dragon.obj" /> @@ -224,7 +224,7 @@ </fileset> </jar> <!-- due to size or usability .. create self packaged jars (code + data) --> - <jar destfile="${jogl.demos.dualDepthPeeling.jar}"> + <jar destfile="${jogl-demos-dualDepthPeeling.jar}"> <fileset dir="${classes}"> <include name="demos/dualDepthPeeling/**" /> </fileset> @@ -238,7 +238,7 @@ <include name="demos/data/**" /> </fileset> </jar> - <jar destfile="${jogl.demos.tennis.jar}"> + <jar destfile="${jogl-demos-tennis.jar}"> <fileset dir="${classes}"> <include name="demos/tennis/**" /> </fileset> @@ -258,8 +258,8 @@ <echo message="classes destdir ${classes}" /> <mkdir dir="${classes}" /> <path id="jogl-demos.classpath"> - <pathelement location="${jogl.all.jar}" /> - <pathelement location="${jogl.cg.jar}" /> + <pathelement location="${jogl-all.jar}" /> + <pathelement location="${jogl-cg.jar}" /> <pathelement location="${gluegen-rt.jar}" /> </path> <javac destdir="${classes}" @@ -274,7 +274,7 @@ <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> - <jar destfile="${jogl.demos.jar}"> + <jar destfile="${jogl-demos.jar}"> <fileset dir="${classes}"> <include name="**" /> </fileset> |