Author: linus Date: 2008-05-04 03:25:53-0700 New Revision: 14611 Modified: trunk/src/argouml-build/build.sh (props changed) trunk/src/argouml-build/build.xml trunk/src/argouml-build/default.properties
Log: Added the argo.tools.dir magic that Tom created. Removed some no longer used dir properties. Modified: trunk/src/argouml-build/build.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&rev=14611&p1=trunk/src/argouml-build/build.xml&p2=trunk/src/argouml-build/build.xml&r1=14610&r2=14611 ============================================================================== --- trunk/src/argouml-build/build.xml (original) +++ trunk/src/argouml-build/build.xml 2008-05-04 03:25:53-0700 @@ -157,6 +157,15 @@ <!-- 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 + Thanks Tom for this magic! --> + <available file="../argouml-core-tools" type="dir" + property="argo.tools.dir" value="../argouml-core-tools"/> + <available file="../../tools" type="dir" + property="argo.tools.dir" value="../../tools"/> + <property file="default.properties"/> <property name="tests.reports" value="${argo.build.dir}/tests"/> @@ -190,16 +199,6 @@ <!-- If it is not set, it defaults to argo.bin.dir, and --> <!-- "build install" will not do anything. --> <property name="developer.bin.dir" value="${argo.bin.dir}"/> - - <!-- Set of properties with fixed paths that we pass to subtasks --> - <propertyset id="absolute-properties" dynamic="false"> - <propertyref name="argo.root.dir" /> - <propertyref name="argo.tools.dir" /> - <propertyref name="argo.model.dir" /> - <propertyref name="argo.mdr.dir" /> - <propertyref name="argo.euml.dir" /> - </propertyset> - </target> <!-- =================================================================== --> @@ -622,8 +621,8 @@ <!-- ================================= target: checkstyle ================================= --> - <target name="checkstyle" depends="init" - description="--> Run Checkstyle on sources"> + <target name="checkstyle" depends="init" + description="Run Checkstyle on sources"> <taskdef resource="checkstyletask.properties" classpath="${argo.tools.dir}/checkstyle-4.3/checkstyle-all-4.3.jar"/> @@ -636,7 +635,7 @@ <formatter type="xml" toFile="${argo.build.dir}/checkstyle_errors.xml"/> </checkstyle> - </target> + </target> <!-- =================================================================== --> <!-- Perform JDepend to find about the structure in ArgoUML. --> Modified: trunk/src/argouml-build/default.properties Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/default.properties?view=diff&rev=14611&p1=trunk/src/argouml-build/default.properties&p2=trunk/src/argouml-build/default.properties&r1=14610&r2=14611 ============================================================================== --- trunk/src/argouml-build/default.properties (original) +++ trunk/src/argouml-build/default.properties 2008-05-04 03:25:53-0700 @@ -36,11 +36,6 @@ # set in one of the user's property files. It should be set to an absolute # path so that it works for subcomponent builds. # -argo.tools.dir=${argo.root.dir}/argouml-core-tools -argo.model.dir=${argo.root.dir}/argouml-core-model -argo.mdr.dir=${argo.root.dir}/argouml-core-model-mdr -argo.euml.dir=${argo.root.dir}/argouml-core-model-emul -# argo.build.dir=${argo.root.dir}/build # argo.tests.dir=${argo.build.dir}/tests @@ -55,11 +50,6 @@ # TODO: Move this back into the build.xml file # argo.build.manifest=${argo.build.classes}/${argo.manifest.name} -# -# Docbook directory locations -# -argo.docbook.dir=${argo.root.dir}/argouml-documentation/docbook-setup - # # javadocs directories --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
