svn commit: r14425 - trunk/src/argouml-core-model-mdr/build.xml

Author: tfmorris
Date: 2008-04-20 12:23:49-0700
New Revision: 14425

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

Log:
Fix command line compile of tests

Modified: trunk/src/argouml-core-model-mdr/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/build.xml?view=diff&rev=14425&p1=trunk/src/argouml-core-model-mdr/build.xml&p2=trunk/src/argouml-core-model-mdr/build.xml&r1=14424&r2=14425
==============================================================================
--- trunk/src/argouml-core-model-mdr/build.xml	(original)
+++ trunk/src/argouml-core-model-mdr/build.xml	2008-04-20 12:23:49-0700
@@ -26,7 +26,8 @@
     <tstamp/>
 
     <!-- argo.root.dir should be passed in to make sure it is correct -->
-    <property name="argo.root.dir" value="../.."/>
+    <!-- but it isn't if we are called property inheritance turned off -->
+    <property name="argo.root.dir" value="${basedir}/.."/>
 
     <property name="build.dir" value="build"/>
     <property name="build.classes" value="${build.dir}/classes"/>
@@ -49,7 +50,12 @@
     <property name="nbmdr.jar" value="lib/nbmdr.jar" /> 
     <property name="jmiutils.jar" value="lib/jmiutils.jar" /> 
     <property name="openide-lookup.jar" value="lib/openide-util.jar" /> 
-        
+  	
+    <!-- Do we want to read user build properties here? -->
+
+    <!-- Read default build properties file (after we've set our props) -->
+    <property file="${argo.root.dir}/argouml-build/default.properties"/>
+  	
     <path id="mdr.generate.classpath">
       <pathelement location="${mdrant.jar}" /> 
       <pathelement location="${nbmdr.jar}" />