Merge branch 'master' of github.com:mbien/jogl

2 files changed, 126 insertions, 2 deletions

diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
new file mode 100644
index 000000000..dd98d30f1
--- /dev/null
+++ b/nbproject/ide-file-targets.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir=".." name="GlueGen-IDE">
+    <!-- edit the following targets according to your needs -->
+    <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html-->
+    <property name="libpath" value="${basedir}/build/lib"/>
+    <target name="init">
+        <path id="cp">
+            <pathelement path="${jdk.home}/lib/tools.jar:${ant.core.lib}:${ant.home}/lib/ant-junit.jar"/>
+            <pathelement location="../gluegen/make/lib/junit.jar"/>
+            <pathelement location="../gluegen/build/gluegen-rt.jar"/>
+            <pathelement location="build/test/build/classes"/>
+            <pathelement location="build/jogl/classes"/>
+            <pathelement location="build/jogl/gensrc/classes"/>
+            <pathelement location="build/newt/classes"/>
+            <pathelement location="build/nativewindow/classes"/>
+            <pathelement location="build/nativewindow/gensrc/classes"/>
+        </path>
+    </target>
+    <target name="compile-test" depends="init">
+        <mkdir dir="build/test/build/classes"/>
+        <javac debug="true" debuglevel="lines,vars,source" destdir="build/test/build/classes" failonerror="false" source="1.5" srcdir="src/junit" includeantruntime="false">
+            <classpath refid="cp"/>
+        </javac>
+    </target>
+    <target name="compile-selected-files-in-junit" depends="init">
+        <fail unless="files">Must set property 'files'</fail>
+        <mkdir dir="build/test/build/classes"/>
+        <javac debug="true" debuglevel="lines,vars,source" destdir="build/test/build/classes" includes="${files}" source="1.5" srcdir="src/junit" includeantruntime="false">
+            <classpath refid="cp"/>
+        </javac>
+    </target>
+    <target name="run-selected-file-in-junit" depends="compile-test">
+        <fail unless="run.class">Must set property 'run.class'</fail>
+        <java classname="${run.class}" failonerror="true" fork="true">
+            <jvmarg value="-Djava.library.path=${libpath}"/>
+            <classpath refid="cp"/>
+        </java>
+    </target>
+    <target depends="compile-test" name="test-selected-file-in-junit">
+        <fail unless="run.class">Must set property 'run.class'</fail>
+        <junit errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="once" showoutput="true">
+            <test name="${run.class}"/>
+            <jvmarg value="-Djava.library.path=${libpath}"/>
+            <classpath refid="cp"/>
+            <formatter type="brief" usefile="false"/>
+        </junit>
+    </target>
+    <target name="debug-selected-file-in-junit" depends="compile-test,init">
+        <fail unless="debug.class">Must set property 'debug.class'</fail>
+        <nbjpdastart addressproperty="jpda.address" name="JOGL" transport="dt_socket">
+            <classpath refid="cp"/>
+        </nbjpdastart>
+        <junit errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="once" showoutput="true">
+            <test name="${debug.class}"/>
+            <classpath refid="cp"/>
+            <jvmarg value="-Djava.library.path=${libpath}"/>
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <formatter type="brief" usefile="false"/>
+        </junit>
+    </target>
+    <!-- TODO: edit the following target according to your needs -->
+    <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) -->
+    <target name="run-selected-file-in-java">
+        <fail unless="run.class">Must set property 'run.class'</fail>
+        <java classname="${run.class}" failonerror="true" fork="true">
+            <classpath/>
+        </java>
+    </target>
+    <!-- TODO: edit the following target according to your needs -->
+    <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#compilesingle) -->
+    <target name="compile-selected-files-in-java">
+        <fail unless="files">Must set property 'files'</fail>
+        <mkdir dir="build/classes"/>
+        <javac destdir="build/classes" includes="${files}" source="1.5" srcdir="src/java">
+            <classpath path="build/classes:${jdk.home}/lib/tools.jar:${ant.core.lib}:lib/antlr-3.2.jar"/>
+        </javac>
+    </target>
+</project>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 887e3f8c2..55eca73f7 100755
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -102,6 +102,45 @@
                         </arity>
                     </context>
                 </action>
+                <action name="debug.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>debug-selected-file-in-junit</target>
+                    <context>
+                        <property>debug.class</property>
+                        <folder>src/junit</folder>
+                        <pattern>\.java$</pattern>
+                        <format>java-name</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
+                <action name="debug.test.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>debug-selected-file-in-junit</target>
+                    <context>
+                        <property>debug.class</property>
+                        <folder>src/junit</folder>
+                        <pattern>\.java$</pattern>
+                        <format>java-name</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
+                <action name="compile.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>compile-selected-files-in-junit</target>
+                    <context>
+                        <property>files</property>
+                        <folder>src/junit</folder>
+                        <pattern>\.java$</pattern>
+                        <format>relative-path</format>
+                        <arity>
+                            <separated-files>,</separated-files>
+                        </arity>
+                    </context>
+                </action>
             </ide-actions>
             <export>
                 <type>folder</type>
@@ -149,15 +188,21 @@
             </view>
             <subprojects/>
         </general-data>
-        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src/newt/classes</package-root>
                 <package-root>src/jogl/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-rt.jar</classpath>
+                <built-to>bin</built-to>
+                <source-level>1.4</source-level>
+            </compilation-unit>
+            <compilation-unit>
                 <package-root>src/junit</package-root>
-                <classpath mode="compile">../gluegen/build/gluegen-rt.jar:../gluegen/make/lib/junit-4.5.jar</classpath>
+                <unit-tests/>
+                <classpath mode="compile">build/jogl/classes:build/jogl/gensrc/classes:build/newt/classes:build/nativewindow/classes:build/nativewindow/gensrc/classes:build/test/build/classes:${jdk.home}/lib/tools.jar:${ant.core.lib}:${ant.home}/lib/ant-junit.jar:../gluegen/make/lib/antlr.jar:../gluegen/make/lib/junit.jar:../gluegen/build/gluegen-rt.jar</classpath>
                 <built-to>bin</built-to>
                 <source-level>1.5</source-level>
             </compilation-unit>