diff options
| -rw-r--r-- | .cvsignore | 3 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | nbproject/project.xml | 94 | ||||
| -rw-r--r-- | test/.cvsignore (renamed from unit_tests/.cvsignore) | 0 | ||||
| -rw-r--r-- | test/build.xml (renamed from unit_tests/build.xml) | 0 | ||||
| -rw-r--r-- | test/lewiscarroll.wav (renamed from unit_tests/lewiscarroll.wav) | bin | 1025476 -> 1025476 bytes | |||
| -rw-r--r-- | test/lib/junit.jar (renamed from unit_tests/lib/junit.jar) | bin | 121070 -> 121070 bytes | |||
| -rw-r--r-- | test/src/OpenALTest.java (renamed from unit_tests/src/OpenALTest.java) | 10 | ||||
| -rw-r--r-- | test/src/Sound3DTest.java (renamed from unit_tests/src/Sound3DTest.java) | 0 | ||||
| -rw-r--r-- | test/src/net/java/games/joal/ALTest.java (renamed from unit_tests/src/net/java/games/joal/ALTest.java) | 0 | ||||
| -rw-r--r-- | www/index.html | 2 |
11 files changed, 102 insertions, 9 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5f3caa4..0000000 --- a/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -apidocs -classes -lib diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df37967 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +build +nbproject/private
\ No newline at end of file diff --git a/nbproject/project.xml b/nbproject/project.xml new file mode 100644 index 0000000..651bd11 --- /dev/null +++ b/nbproject/project.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <name>JOAL</name> + </general-data> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>JOAL</name> + <properties> + <property name="ant.script">/home/mbien/NetBeansProjects/JOGAMP/joal/make/build.xml</property> + </properties> + <folders> + <source-folder> + <label>JOGL</label> + <location>.</location> + <encoding>UTF-8</encoding> + </source-folder> + <source-folder> + <label>src/java</label> + <type>java</type> + <location>src/java</location> + <encoding>UTF-8</encoding> + </source-folder> + <source-folder> + <label>test/src</label> + <type>java</type> + <location>test/src</location> + <encoding>UTF-8</encoding> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>${ant.script}</script> + <target>all</target> + </action> + <action name="clean"> + <script>${ant.script}</script> + <target>clean</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> + <action name="rebuild"> + <script>${ant.script}</script> + <target>clean</target> + <target>all</target> + </action> + <action name="test"> + <script>${ant.script}</script> + <target>test</target> + </action> + </ide-actions> + <view> + <items> + <source-folder style="packages"> + <label>src/java</label> + <location>src/java</location> + </source-folder> + <source-folder style="packages"> + <label>test/src</label> + <location>test/src</location> + </source-folder> + <source-file> + <location>${ant.script}</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="rebuild"/> + <ide-action name="clean"/> + <ide-action name="javadoc"/> + <ide-action name="test"/> + </context-menu> + </view> + <subprojects/> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2"> + <compilation-unit> + <package-root>src/java</package-root> + <classpath mode="compile">../gluegen/build/gluegen-rt.jar:build/classes</classpath> + <source-level>1.5</source-level> + </compilation-unit> + <compilation-unit> + <package-root>test/src</package-root> + <unit-tests/> + <classpath mode="compile">../gluegen/build/gluegen-rt.jar:build/classes:test/lib/junit.jar</classpath> + <source-level>1.5</source-level> + </compilation-unit> + </java-data> + </configuration> +</project> diff --git a/unit_tests/.cvsignore b/test/.cvsignore index 90b07e9..90b07e9 100644 --- a/unit_tests/.cvsignore +++ b/test/.cvsignore diff --git a/unit_tests/build.xml b/test/build.xml index 7b1f8e2..7b1f8e2 100644 --- a/unit_tests/build.xml +++ b/test/build.xml diff --git a/unit_tests/lewiscarroll.wav b/test/lewiscarroll.wav Binary files differindex 2314d39..2314d39 100644 --- a/unit_tests/lewiscarroll.wav +++ b/test/lewiscarroll.wav diff --git a/unit_tests/lib/junit.jar b/test/lib/junit.jar Binary files differindex 674d71e..674d71e 100644 --- a/unit_tests/lib/junit.jar +++ b/test/lib/junit.jar diff --git a/unit_tests/src/OpenALTest.java b/test/src/OpenALTest.java index 5b9930a..fb63a2f 100644 --- a/unit_tests/src/OpenALTest.java +++ b/test/src/OpenALTest.java @@ -4,17 +4,17 @@ * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * -* -Redistribution of source code must retain the above copyright notice, +* -Redistribution of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * -* -Redistribution in binary form must reproduce the above copyright notice, +* -Redistribution in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * -* Neither the name of Sun Microsystems, Inc. or the names of contributors may -* be used to endorse or promote products derived from this software without +* Neither the name of Sun Microsystems, Inc. or the names of contributors may +* be used to endorse or promote products derived from this software without * specific prior written permission. -* +* * This software is provided "AS IS," without a warranty of any kind. * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR diff --git a/unit_tests/src/Sound3DTest.java b/test/src/Sound3DTest.java index f6a65a3..f6a65a3 100644 --- a/unit_tests/src/Sound3DTest.java +++ b/test/src/Sound3DTest.java diff --git a/unit_tests/src/net/java/games/joal/ALTest.java b/test/src/net/java/games/joal/ALTest.java index 7b25aa1..7b25aa1 100644 --- a/unit_tests/src/net/java/games/joal/ALTest.java +++ b/test/src/net/java/games/joal/ALTest.java diff --git a/www/index.html b/www/index.html index d3738ac..985ca85 100644 --- a/www/index.html +++ b/www/index.html @@ -16,7 +16,7 @@ <li><a href="http://jogamp.org/">Home</a></li> <li><a href="../../jocl/www">JOCL</a></li> <li><a href="../../jogl/www">JOGL</a></li> - <!--<li><a href="../../jogl-demos/www">Demos</a></li> + <li><a href="../../joal-demos/www">Demos</a></li> <li><a href="../../wiki/index.php/Jogl_FAQ">Wiki</a></li>--> <li><a href="http://download.java.net/media/joal/builds/nightly/javadoc_public/">JavaDoc</a></li> </ul> |