[Gzz-commits] fenfire build.xml

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/25 13:16:34

Modified files:
        .              : build.xml 

Log message:
        Fix mudyc's braces to be curly. Reorganize paths to be able to use live 
dep-projects.

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

Patches:
Index: fenfire/build.xml
diff -u fenfire/build.xml:1.14 fenfire/build.xml:1.15
--- fenfire/build.xml:1.14      Tue Mar 25 08:47:01 2003
+++ fenfire/build.xml   Tue Mar 25 13:16:34 2003
@@ -3,7 +3,7 @@
 <project name="fenfire" basedir="." default="fenfire">
 
     <property name="src" location="${basedir}"/>
-    <property name="build" location="build"/>
+    <property name="build" location="./build/"/>
     <property name="dep" location="../fenfire-depends"/>
     <property name="releasetag" value="snapshot"/>
 
@@ -18,7 +18,7 @@
     <target name="compile">
         <mkdir dir="${build}"/>
        <javac srcdir="${src}" destdir="${build}">
-           <classpath refid="depends.path"/>
+           <classpath refid="theClassPath"/>
        </javac>
     </target>
 
@@ -29,7 +29,7 @@
            <arg value="org"/>
            <sysproperty key="python.path" 
                         value="${dep}/jythonlib.jar:${dep}/pythonlib.jar:."/>
-           <classpath refid="depends.path"/>
+           <classpath refid="theClassPath"/>
        </java>        
     </target>
 
@@ -38,19 +38,19 @@
              failonerror="true">
            <sysproperty key="python.path" 
                         value="${dep}/jythonlib.jar:${dep}/pythonlib.jar:."/>
-           <classpath refid="depends.path"/>
+           <classpath refid="theClassPath"/>
        </java>        
     </target>
 
     <target name="run">
         <java classname="org.fenfire.loom.Loom" fork="true">
            <arg value="${file}"/>
-           <classpath refid="depends.path"/>
+           <classpath refid="theClassPath"/>
        </java>
     </target>
 
-    <target name="rmi">
-        <rmic base="$(build)" includes="**/PPAction*.class"/>
+    <target name="rmi" depends="compile">
+        <rmic base="${build}" includes="**/PPAction*.class"/>
     </target>
 
     <target name="jar" depends="clean,fenfire,jar-only"/>
@@ -114,11 +114,30 @@
        </delete>
     </target>
 
+    <path id="theClassPath">
+       <path refid="develPath"/>
+    </path>
 
-    <path id="depends.path">
+    <path id="cannedPath">
         <pathelement path="${classpath}"/>
        <pathelement location="build/"/>
         <pathelement location="lib/libvob.jar"/>
+       <path refid="depends.path"/>
+    </path>
+
+    <path id="develPath">
+        <pathelement path="${classpath}"/>
+       <pathelement location="build/"/>
+       <pathelement location="../storm/CLASSES"/>
+       <pathelement location="../alph/CLASSES"/>
+       <pathelement location="../libvob/CLASSES"/>
+       <path refid="depends.path"/>
+    </path>
+
+    <!-- The path of the .jars in depends. Used as a "subroutine"
+       by the real paths.
+       -->
+    <path id="depends.path">
         <pathelement location="${dep}/jython.jar"/>
         <pathelement location="${dep}/jena.jar"/>
         <pathelement location="${dep}/icu4j.jar"/>