diff options
| -rw-r--r-- | make/build-jogl.xml | 8 | ||||
| -rw-r--r-- | make/build-test.xml | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index b708ae0dc..6a0eca500 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -1396,7 +1396,7 @@ <!-- - Build the jogl.jar files. --> - <target name="build-jars-dependset" depends="gluegen.cpptasks.detect.os,build-jars-javase" > + <target name="build-jars-dependset" depends="init,gluegen.cpptasks.detect.os" > <dependset> <srcfileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> @@ -1404,7 +1404,7 @@ includes="${jogl.all.jar} ${jogl.all-noawt.jar} ${jogl.util.jar} ${jogl.util.fixedfuncemu.jar}" /> </dependset> </target> - <target name="build-jars" depends="build-jars-dependset" /> + <target name="build-jars" depends="build-jars-dependset,build-jars-javase" /> <target name="setup-manifestfile" depends="common.init"> <property name="manifestfile" value="joglversion"/> @@ -1490,6 +1490,10 @@ <fileset dir="${src.java}" includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> </jar> + <copy todir="${classes}"> + <fileset dir="${src.java}" + includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> + </copy> </target> <target name="build-jars-all-noawt-javase" depends="setup-manifestfile"> <jar manifest="${build.jogl}/tempversion" destfile="${jogl.all-noawt.jar}" filesonly="true"> diff --git a/make/build-test.xml b/make/build-test.xml index b6c728870..18b131594 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -33,6 +33,8 @@ <condition property="jvmarg.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition> <property name="batchtest.timeout" value="1800000"/> <!-- 30 min --> + + <property name="java.part.test.shadercode" value="com/jogamp/opengl/test/junit/jogl/demos/es2/shader/*"/> </target> <!-- ================================================================== --> @@ -97,7 +99,11 @@ <fileset dir="${src.test}"> <exclude name="**/*.java"/> </fileset> + <fileset dir="${src.test}" includes="${java.part.test.shadercode}"/> </jar> + <copy todir="${classes}"> + <fileset dir="${src.test}" includes="${java.part.test.shadercode}"/> + </copy> </target> <target name="test.manual.run" depends="test.compile"> |