Author: tfmorris Date: 2008-04-27 10:52:13-0700 New Revision: 14489 Modified: trunk/src/argouml-app/build.xml
Log: Figure out where tools directory is for our configuration Modified: trunk/src/argouml-app/build.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/build.xml?view=diff&rev=14489&p1=trunk/src/argouml-app/build.xml&p2=trunk/src/argouml-app/build.xml&r1=14488&r2=14489 ============================================================================== --- trunk/src/argouml-app/build.xml (original) +++ trunk/src/argouml-app/build.xml 2008-04-27 10:52:13-0700 @@ -37,7 +37,17 @@ <!-- if it is set in a property file before now, it must be absolute --> <property name="argo.root.dir" value="${basedir}/.." /> <property file="${override.build.properties}"/> + + <!-- Try to figure out where our tools directory is. Done after overrides + are loaded so user can override, but before defaults --> + <property name="tool.test.file" value="checkstyle/java.header"/> + <available file="${argo.root.dir}/argouml-core-tools/${tool.test.file}" + type="dir" property="argo.tools.dir" value="${argo.root.dir}/argouml-core-tools"/> + <available file="../../tools/${tool.test.file}" + type="dir" property="argo.tools.dir" value="../../tools"/> + <property file="default.properties"/> + <property file="${argo.root.dir}/argouml-build/default.properties"/> <property name="build.dir" value="build"/> @@ -83,10 +93,6 @@ <path id="tests.compile.classpath"> <pathelement location="${build.classes}"/> - <pathelement location="../../tools/junit-3.8.2/junit.jar"/> - <pathelement location="../../tools/lib/easymock12.jar"/> - <pathelement location="../../tools/jdepend-2.9/lib/jdepend-2.9.jar"/> - <!-- Not sure if this will work for the single tree checkout, so we'll leave the old versions for now - tfm --> <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/> <pathelement location="${argo.tools.dir}/lib/easymock12.jar"/> <pathelement location="${argo.tools.dir}/jdepend-2.9/lib/jdepend-2.9.jar"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
