diff options
| author | JOGAMP DEV TEAM <[email protected]> | 2010-04-22 21:12:36 -0400 |
|---|---|---|
| committer | JOGAMP DEV TEAM <[email protected]> | 2010-04-22 21:12:36 -0400 |
| commit | 1d889ddc4728d1534e310b44fad74a2932d22d39 (patch) | |
| tree | 4ad0c3eeb3ef728522ac9459eb12c667301a0c32 /nbproject | |
| parent | 8790075f074013aa3c71b96993838cf1117275f1 (diff) | |
| parent | a588326d206ff32e5ff5db97560851cb9b826022 (diff) | |
Merge branch 'master' of github.com:sgothel/jogl
Diffstat (limited to 'nbproject')
| -rwxr-xr-x | nbproject/project.xml | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/nbproject/project.xml b/nbproject/project.xml index 0c128d1f1..f1a94a2a5 100755 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -47,6 +47,12 @@ <location>src/nativewindow/classes</location> <encoding>UTF-8</encoding> </source-folder> + <source-folder> + <label>src/junit</label> + <type>java</type> + <location>src/junit</location> + <encoding>UTF-8</encoding> + </source-folder> </folders> <ide-actions> <action name="build"> @@ -75,6 +81,14 @@ </arity> </context> </action> + <action name="test"> + <script>${ant.script}</script> + <target>junit.run</target> + </action> + <action name="javadoc"> + <script>${ant.script}</script> + <target>javadoc</target> + </action> </ide-actions> <export> <type>folder</type> @@ -104,6 +118,10 @@ <label>nativewindow</label> <location>src/nativewindow/classes</location> </source-folder> + <source-folder style="packages"> + <label>src/junit</label> + <location>src/junit</location> + </source-folder> <source-file> <location>${ant.script}</location> </source-file> @@ -112,6 +130,8 @@ <ide-action name="build"/> <ide-action name="rebuild"/> <ide-action name="clean"/> + <ide-action name="javadoc"/> + <ide-action name="test"/> </context-menu> </view> <subprojects/> @@ -120,12 +140,13 @@ <compilation-unit> <package-root>src/newt/classes</package-root> <package-root>src/jogl/classes</package-root> - <package-root>build/jogl/gensrc/classes</package-root> <package-root>src/nativewindow/classes</package-root> + <package-root>build/jogl/gensrc/classes</package-root> <package-root>build/nativewindow/gensrc/classes</package-root> - <classpath mode="compile">../gluegen/build/gluegen.jar</classpath> + <package-root>src/junit</package-root> + <classpath mode="compile">../gluegen/build/gluegen-rt.jar:../gluegen/make/lib/junit-4.5.jar</classpath> <built-to>bin</built-to> - <source-level>1.4</source-level> + <source-level>1.5</source-level> </compilation-unit> </java-data> </configuration> |