svn commit: r12760 - trunk/src/model-mdr/build.xml

Author: tfmorris
Date: 2007-06-05 14:07:19-0700
New Revision: 12760

Modified:
   trunk/src/model-mdr/build.xml

Log:
Switch to patched version of MDRant and update to Ant 1.7

Modified: trunk/src/model-mdr/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/build.xml?view=diff&rev=12760&p1=trunk/src/model-mdr/build.xml&p2=trunk/src/model-mdr/build.xml&r1=12759&r2=12760
==============================================================================
--- trunk/src/model-mdr/build.xml	(original)
+++ trunk/src/model-mdr/build.xml	2007-06-05 14:07:19-0700
@@ -38,7 +38,7 @@
     <property name="result.jar" value="argouml-mdr.jar"/>
     <property name="javainterfaces.jar" value="java-interfaces.jar"/>
 
-    <property name="mdrant.jar" value="tools/lib/mdrant.jar" /> 
+    <property name="mdrant.jar" value="tools/lib/mdrant-patched.jar" /> 
     <property name="mof.jar" value="${lib.dir}/mof.jar" /> 
     <property name="jmi.jar" value="${lib.dir}/jmi.jar" /> 
     <property name="mdrapi.jar" value="${lib.dir}/mdrapi.jar" /> 
@@ -101,7 +101,7 @@
     </taskdef>
     
     <path id="ant.optional.classpath">
-      <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
+      <pathelement location="${ant.home}/ant-junit.jar"/>
       <path refid="junit.classpath"/>
     </path>
         
@@ -173,6 +173,8 @@
                put it in the caller's directory when called from argouml build
     -->
     <echo message="Generating JMI interfaces from ${xmi.file}"/>
+    <echo message="Storage file is in ${basedir}/${build.javas}"/>
+    <echo message="Sources written to ${build.javas}"/>
     <mdr storageFile="${basedir}/${build.javas}/mymdr">
       <instantiate name="mof4models" /> 
       <readXMI file="${xmi.file}.xml" extent="mof4models" /> 
@@ -191,6 +193,7 @@
       <printExtentNames/>
       -->
     </mdr>
+
   </target>
   
   <!-- =================================================================== -->