diff options
| -rw-r--r-- | make/build-jogl.xml | 10 | ||||
| -rw-r--r-- | make/build-test.xml | 16 |
2 files changed, 9 insertions, 17 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 47511333d..c03f2f898 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -157,15 +157,15 @@ <property name="java.part.util.graph.shadercode" value="jogamp/graph/curve/opengl/shader/* jogamp/graph/curve/opengl/shader/bin/**"/> - <property name="java.part.nonjava" - value="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> - <property name="java.part.util.fixedfuncemu" value="jogamp/opengl/util/glsl/fixedfunc/**"/> <property name="java.part.util.fixedfuncemu.shadercode" value="jogamp/opengl/util/glsl/fixedfunc/shaders/* jogamp/opengl/util/glsl/fixedfunc/shaders/bin/**"/> + <property name="java.part.nonjava" + value="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> + <property name="java.part.all-desktop" value="${java.part.sdk} ${java.part.glx} ${java.part.wgl} ${java.part.cgl} ${java.part.gldesktop} ${java.part.glugldesktop} ${java.part.util.gldesktop}"/> @@ -1550,14 +1550,10 @@ <fileset dir="${classes}" includes="${java.part.util} ${java.part.util.glsl} ${java.part.util.graph}" excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/> - <fileset dir="${src.java}" - includes="${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.util.fixedfuncemu}"/> - <fileset dir="${src.java}" - includes="${java.part.util.fixedfuncemu.shadercode}"/> </jar> <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl.omx.jar}" filesonly="true"> <fileset dir="${classes}" diff --git a/make/build-test.xml b/make/build-test.xml index ed7584feb..8109798f4 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -33,8 +33,6 @@ <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> <!-- ================================================================== --> @@ -90,21 +88,19 @@ <classpath refid="junit_jogl_newt_android.compile.classpath"/> <src path="${src.test}" /> </javac> + <!-- include any resource files that tests may require --> + <copy todir="${classes}"> + <fileset dir="${src.test}"> + <exclude name="**/*.java"/> + </fileset> + </copy> <jar destfile="${jogl.test.jar}" filesonly="true"> <!-- get all class files, but skip any resource files that external tools might have copied into the class directory (otherwise, it's possible to get the same resource file twice in the jar) --> <fileset dir="${classes}" includes="${java.part.test}"/> - <!-- include any resource files that tests may requre --> - <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"> |