[Mulgara-svn] r199 - in trunk/src/jar: query rules

[ronald at mulgara.org]

Author: ronald
Date: 2007-03-01 01:01:36 -0600 (Thu, 01 Mar 2007)
New Revision: 199

Modified:
   trunk/src/jar/query/build.xml
   trunk/src/jar/rules/build.xml
Log:
 - fix unconverted dependency check leftover from Kowari.
 - fix duplicate target and property definitions


Modified: trunk/src/jar/query/build.xml
===================================================================
--- trunk/src/jar/query/build.xml	2007-03-01 06:57:27 UTC (rev 198)
+++ trunk/src/jar/query/build.xml	2007-03-01 07:01:36 UTC (rev 199)
@@ -55,21 +55,21 @@
     <mkdir dir="${query.obj.dir}/java"/>
   </target>
 
-  <target name="-unjar-config"
-          depends="-unjar-config-uptodate"
-          unless="unjar.config.uptodate">
+  <target name="-query-unjar-config"
+          depends="-query-unjar-config-uptodate"
+          unless="query.unjar.config.uptodate">
 
     <unjar src="${bin.dir}/${config.jar}" dest="${query.obj.dir}/classes"/>
   </target>
 
-  <target name="-unjar-config-uptodate">
+  <target name="-query-unjar-config-uptodate">
 
-    <available file="${query.obj.dir}/classes/org/mulgara/config/TucanaConfig.class"
-               property="unjar.config.uptodate"/>
+    <available file="${query.obj.dir}/classes/org/mulgara/config/MulgaraConfig.class"
+               property="query.unjar.config.uptodate"/>
   </target>
 
   <target name="query-compile"
-          depends="-query-prepare, util-jar, rules-jar, config-jar, -unjar-config"
+          depends="-query-prepare, util-jar, rules-jar, config-jar, -query-unjar-config"
           description="Compiles all query related files included generated
                        source code"
           unless="query.classes.uptodate">

Modified: trunk/src/jar/rules/build.xml
===================================================================
--- trunk/src/jar/rules/build.xml	2007-03-01 06:57:27 UTC (rev 198)
+++ trunk/src/jar/rules/build.xml	2007-03-01 07:01:36 UTC (rev 199)
@@ -52,21 +52,21 @@
     <mkdir dir="${rules.obj.dir}/java"/>
   </target>
 
-  <target name="-unjar-config"
-          depends="-unjar-config-uptodate"
-          unless="unjar.config.uptodate">
+  <target name="-rules-unjar-config"
+          depends="-rules-unjar-config-uptodate"
+          unless="rules.unjar.config.uptodate">
 
     <unjar src="${bin.dir}/${config.jar}" dest="${rules.obj.dir}/classes"/>
   </target>
 
-  <target name="-unjar-config-uptodate">
+  <target name="-rules-unjar-config-uptodate">
 
-    <available file="${rules.obj.dir}/classes/org/mulgara/config/TucanaConfig.class"
-               property="unjar.config.uptodate"/>
+    <available file="${rules.obj.dir}/classes/org/mulgara/config/MulgaraConfig.class"
+               property="rules.unjar.config.uptodate"/>
   </target>
 
   <target name="rules-compile"
-          depends="-rules-prepare, util-jar, config-jar, -unjar-config"
+          depends="-rules-prepare, util-jar, config-jar, -rules-unjar-config"
           description="Compiles all rules related files included generated
                        source code"
           unless="rules.classes.uptodate">
@@ -80,8 +80,8 @@
     </javac>
 
     <rmic classname="org.mulgara.rules.RulesRefImpl"
-              base="${obj.dir}/jar/rules/classes">
-                  
+          base="${rules.obj.dir}/classes">
+
       <classpath refid="rules-classpath"/>
     </rmic>