svn commit: r14259 - branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml

Author: dthompson
Date: 2008-03-29 16:17:01-0700
New Revision: 14259

Modified:
   branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml

Log:
Updated build.xml files to make junit tests work.

Junit tests now seem to compile and run ok, but there's an error while generating the reports.

Modified: branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml?view=diff&rev=14259&p1=branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml&p2=branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml&r1=14258&r2=14259
==============================================================================
--- branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml	(original)
+++ branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml	2008-03-29 16:17:01-0700
@@ -3,14 +3,11 @@
 
 Build file for the MDR implementation of the Model subsystem.
 
-This is designed to work in two different environments:
-  - in a subdirectory of argouml, as stored in the repository
-    (ie argouml/src/model-mdr)
-    Used when compiling, running tests from the command line.
-  - in a peer directory of argouml, as checked out for Eclipse
-    (ie argouml-core-model-mdr)
+This is designed to work in only one environment:
+  - in a peer directory of argouml-app, as checked out for Eclipse,
+    or with SVN (ie argouml-core-model-mdr).
     Used only to build the MDR specific things. Other Eclipse settings
-    take care of compiling, running tests.    
+    take care of compiling, running tests.
 
 Building this requires: 
     infra
@@ -26,7 +23,7 @@
     <tstamp/>
 
     <!-- argo.root.dir should be passed in to make sure it is correct -->
-    <property name="argo.root.dir" value="../.."/>
+    <property name="argo.root.dir" value=".."/>
 
     <property name="build.dir" value="build"/>
     <property name="build.classes" value="${build.dir}/classes"/>
@@ -43,7 +40,7 @@
     <property name="javainterfaces.jar" value="java-interfaces.jar"/>
 
     <property name="mdrant.jar" value="tools/lib/mdrant-patched.jar" /> 
-    <property name="mof.jar" value="lib/mof.jar" /> 
+    <property name="mof.jar" value="lib/mof.jar" />
     <property name="jmi.jar" value="lib/jmi.jar" /> 
     <property name="mdrapi.jar" value="lib/mdrapi.jar" /> 
     <property name="nbmdr.jar" value="lib/nbmdr.jar" /> 
@@ -84,6 +81,7 @@
       <pathelement location="${junit.jar.path}"/>
       <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
       <pathelement location="${argo.root.dir}/tools/junit-3.8.2/junit.jar"/>
+      <pathelement location="${argo.root.dir}/argouml-core-tools/junit-3.8.2/junit.jar"/>
     </path>
 
     <path id="tests.compile.classpath">