[Gzz-commits] fenfire build.xml

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/26 13:14:28

Modified files:
        .              : build.xml 

Log message:
        Testing, glifying

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/build.xml.diff?tr1=1.19&tr2=1.20&r1=text&r2=text

Patches:
Index: fenfire/build.xml
diff -u fenfire/build.xml:1.19 fenfire/build.xml:1.20
--- fenfire/build.xml:1.19      Wed Mar 26 06:49:49 2003
+++ fenfire/build.xml   Wed Mar 26 13:14:28 2003
@@ -6,11 +6,14 @@
     <property name="build" location="./build/"/>
     <property name="dep" location="../fenfire-depends"/>
     <property name="releasetag" value="snapshot"/>
+    <property name="test" value="org"/>
 
     <!-- A filename can be passed to Loom at startup by
          overriding this property -->
     <property name="file" value=""/>
 
+    <property name="pythonpath" 
value="${dep}/jythonlib.jar:${dep}/pythonlib.jar:.:../libvob/"/>
+
     <target name="fenfire" depends="compile,test" 
             description="Compile and test Fenfire">
     </target>
@@ -28,13 +31,27 @@
            <rmic base="${build}" includes="**/PPActionsImpl*.class"/>
        </target>
 
-    <target name="test">
+    <target name="test" depends="test-awt,test-gl"/>
+
+    <target name="test-awt">
+        <java classname="org.python.util.jython" fork="true"
+             failonerror="true">
+           <arg value="org/fenfire/test/test.py"/>
+           <arg value="${test}"/>
+           <sysproperty key="python.path" value="${pythonpath}"/>
+           <classpath refid="theClassPath"/>
+       </java>        
+    </target>
+
+    <target name="test-gl">
         <java classname="org.python.util.jython" fork="true"
              failonerror="true">
+           <sysproperty key="vob.api" value="gl"/> 
+           <env key="LD_LIBRARY_PATH" value="../libvob/src/jni"/>
            <arg value="org/fenfire/test/test.py"/>
-           <arg value="org"/>
+           <arg value="${test}"/>
            <sysproperty key="python.path" 
-                        value="${dep}/jythonlib.jar:${dep}/pythonlib.jar:."/>
+                        value="${pythonpath}"/>
            <classpath refid="theClassPath"/>
        </java>        
     </target>
@@ -43,19 +60,19 @@
         <java classname="org.python.util.jython" fork="true"
              failonerror="true">
            <sysproperty key="python.path" 
-                        value="${dep}/jythonlib.jar:${dep}/pythonlib.jar:."/>
+                        value="${pythonpath}"/>
            <classpath refid="theClassPath"/>
        </java>        
     </target>
 
-    <target name="run">
+    <target name="run-awt">
         <java classname="org.fenfire.loom.Loom" fork="true">
            <arg value="${file}"/>
            <classpath refid="theClassPath"/>
        </java>
     </target>
 
-    <target name="rungl">
+    <target name="run-gl">
         <java classname="org.fenfire.loom.Loom" fork="true">
            <sysproperty key="vob.api" value="gl"/> 
            <env key="LD_LIBRARY_PATH" value="../libvob/src/jni"/>