aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2011-04-01 15:09:51 +0200
committerSven Gothel <sgothel@jausoft.com>2011-04-01 15:09:51 +0200
commit259d018ed9511ccca0d8e792e443ce9f3d9f39ea (patch)
treea8a49dc2415d79e5b87ae5e2564e875b200e21ed /make
parent3fe39f89b7948ec6fceda0bf68ab6c5cdd9e32ed (diff)
Add graph shaders and fonts ..
Diffstat (limited to 'make')
-rw-r--r--make/build-jogl.xml12
-rwxr-xr-xmake/scripts/tests.sh9
2 files changed, 18 insertions, 3 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index aef4b2f47..28b5c4956 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -144,6 +144,12 @@
<property name="java.part.util.graph"
value="com/jogamp/graph/** jogamp/graph/**"/>
+ <property name="java.part.util.graph.fonts"
+ value="jogamp/graph/font/fonts/**"/>
+
+ <property name="java.part.util.graph.shadercode"
+ value="jogamp/graph/curve/opengl/shader/* jogamp/graph/curve/opengl/shader/bin/**"/>
+
<property name="java.part.util.fixedfuncemu"
value="jogamp/opengl/util/glsl/fixedfunc/**"/>
@@ -1474,7 +1480,7 @@
<include name="jogamp/graph/**" />
</fileset>
<fileset dir="${src.java}"
- includes="${java.part.util.fixedfuncemu.shadercode}"/>
+ includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/>
</jar>
</target>
<target name="build-jars-all-noawt-javase" depends="setup-manifestfile">
@@ -1490,7 +1496,7 @@
<include name="jogamp/graph/**" />
</fileset>
<fileset dir="${src.java}"
- includes="${java.part.util.fixedfuncemu.shadercode}"/>
+ includes="${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/>
</jar>
</target>
@@ -1540,6 +1546,8 @@
<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}/tempversion" destfile="${jogl.util.fixedfuncemu.jar}" filesonly="true">
<fileset dir="${classes}"
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 52dd65ac6..f288d5602 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -135,7 +135,7 @@ function testawtmt() {
#testawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT
#testawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated
#testnoawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
-testnoawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn $*
#
@@ -196,5 +196,12 @@ testnoawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn $*
#testawt com.jogamp.opengl.test.junit.newt.TestFocus02SwingAWTRobot
#testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT $*
+#testnoawt com.jogamp.opengl.test.junit.graph.TestRegionRenderer01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRenderer01 $*
+testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $*
+
$spath/count-edt-start.sh java-run.log