[Mulgara-svn] r556 - in trunk/src/jar: config itql

[pag at mulgara.org]

Author: pag
Date: 2007-11-15 14:38:43 -0600 (Thu, 15 Nov 2007)
New Revision: 556

Modified:
   trunk/src/jar/config/build.xml
   trunk/src/jar/itql/build.xml
Log:
some minor dependency fixes to make building a little more consistent

Modified: trunk/src/jar/config/build.xml
===================================================================
--- trunk/src/jar/config/build.xml	2007-11-15 18:37:40 UTC (rev 555)
+++ trunk/src/jar/config/build.xml	2007-11-15 20:38:43 UTC (rev 556)
@@ -11,10 +11,14 @@
   <!-- =================================================================== -->
   <target name="config-generate-uptodate">
 
-    <uptodate property="config-generate-uptodate"
-       targetfile="${config.dist.dir}/${config.jar}">
-      <srcfiles dir="${conf.dir}" includes="mulgara-embedded.xsd"/>
-    </uptodate>
+    <condition property="config-generate-uptodate">
+      <and>
+        <uptodate targetfile="${config.dist.dir}/${config.jar}">
+          <srcfiles dir="${conf.dir}" includes="mulgara-embedded.xsd"/>
+        </uptodate>
+        <available file="${obj.dir}/jar/config/java" type="dir"/>
+      </and>
+    </condition>
   </target>
 
   <target name="config-generate" depends="config-generate-uptodate"

Modified: trunk/src/jar/itql/build.xml
===================================================================
--- trunk/src/jar/itql/build.xml	2007-11-15 18:37:40 UTC (rev 555)
+++ trunk/src/jar/itql/build.xml	2007-11-15 20:38:43 UTC (rev 556)
@@ -49,7 +49,7 @@
     <mkdir dir="${itql.obj.dir}/java"/>
   </target>
 
-  <target name="gen-itql-parser" depends="-prepare-build, itql-parser-uptodate, sablecc" unless="itql-parser-uptodate">
+  <target name="gen-itql-parser" depends="-itql-prepare, itql-parser-uptodate, sablecc" unless="itql-parser-uptodate">
     <sablecc src="${itql.src.dir}/sablecc" outputdirectory="${itql.obj.dir}/java">
       <include name="itql.grammar"/>
     </sablecc>
@@ -143,6 +143,7 @@
       <zipfileset src="${lib.dir}/${saaj.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${emory-util.jar}" excludes="META-INF/**"/>
       <zipfileset src="${lib.dir}/${jta.jar}" excludes="META-INF/**"/>
+      <zipfileset src="${lib.dir}/${axis.jar}" excludes="META-INF/**"/>
     </jar>
   </target>