Author: dthompson Date: 2008-05-03 06:38:31-0700 New Revision: 14599 Modified: trunk/src/argouml-build/ (props changed) trunk/src/argouml-build/build.xml
Log: Updated src/argouml-build/build.xml to use basedir="." (was ".."), and output to src/argouml-build/build/. Modified: trunk/src/argouml-build/build.xml Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&rev=14599&p1=trunk/src/argouml-build/build.xml&p2=trunk/src/argouml-build/build.xml&r1=14598&r2=14599 ============================================================================== --- trunk/src/argouml-build/build.xml (original) +++ trunk/src/argouml-build/build.xml 2008-05-03 06:38:31-0700 @@ -69,7 +69,7 @@ --> -<project basedir=".." default="package" name="argouml"> +<project basedir="." default="package" name="argouml"> <!-- =================================================================== --> <!-- Global initialization --> @@ -147,7 +147,7 @@ </tstamp> <property name="local.build.properties" - value="argouml-build/build.properties"/> + value="build.properties"/> <property name="user.build.properties" value="${user.home}/argouml.build.properties"/> <property file="${local.build.properties}"/> @@ -157,7 +157,7 @@ <!-- 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}"/> - <property file="argouml-build/default.properties"/> + <property file="default.properties"/> <property name="tests.reports" value="${argo.build.dir}/tests"/> @@ -238,36 +238,36 @@ description="Prepare all jar files, both built and just delivered."> <!-- Build the subdirs in order. --> - <ant dir="argouml-core-infra" inheritAll="false" target="jar"/> - <ant dir="argouml-core-model" inheritAll="false" target="jar"/> - <ant dir="argouml-core-model-mdr" inheritAll="false" target="jar"/> + <ant dir="../argouml-core-infra" inheritAll="false" target="jar"/> + <ant dir="../argouml-core-model" inheritAll="false" target="jar"/> + <ant dir="../argouml-core-model-mdr" inheritAll="false" target="jar"/> <!-- <ant dir="argouml-core-model-euml" inheritAll="false" target="jar"/> --> - <ant dir="argouml-app" inheritAll="false" target="jar"/> + <ant dir="../argouml-app" inheritAll="false" target="jar"/> <!-- Copy everything to the build directory --> <mkdir dir="${argo.build.dir}"/> <copy todir="${argo.build.dir}"> - <fileset dir="argouml-core-infra/build"> + <fileset dir="../argouml-core-infra/build"> <include name="*"/> </fileset> - <fileset dir="argouml-core-model/build"> + <fileset dir="../argouml-core-model/build"> <include name="*"/> </fileset> - <fileset dir="argouml-core-model-mdr/build"> + <fileset dir="../argouml-core-model-mdr/build"> <include name="*"/> </fileset> <!-- model-euml Not currently included --> - <fileset dir="argouml-app/build"> + <fileset dir="../argouml-app/build"> <include name="*"/> </fileset> </copy> <!-- The argouml.jar is copied again and again since it is modified below --> <copy todir="${argo.build.dir}" overwrite="on"> - <fileset dir="argouml-app/build"> + <fileset dir="../argouml-app/build"> <include name="argouml.jar"/> </fileset> </copy> @@ -306,20 +306,20 @@ <!-- Build the subdirs in order. --> <!-- infra doesn't have tests. --> - <ant dir="argouml-core-infra" inheritAll="false" target="jar"/> + <ant dir="../argouml-core-infra" inheritAll="false" target="jar"/> <!-- model doesn't have tests. --> - <ant dir="argouml-core-model" inheritAll="false" target="jar"/> + <ant dir="../argouml-core-model" inheritAll="false" target="jar"/> - <ant dir="argouml-core-model-mdr" inheritAll="false" target="tests"/> + <ant dir="../argouml-core-model-mdr" inheritAll="false" target="tests"/> <!-- <ant dir="model-euml" inheritAll="false" target="tests"/> --> <!-- why is this called twice? Can't we use a single target with dependencies? tfm --> - <ant dir="argouml-core-model-mdr" inheritAll="false" target="jar"/> + <ant dir="../argouml-core-model-mdr" inheritAll="false" target="jar"/> - <ant dir="argouml-app" inheritAll="false" target="tests"/> + <ant dir="../argouml-app" inheritAll="false" target="tests"/> <antcall target="tests-reports"/> </target> @@ -347,11 +347,11 @@ <delete dir="${argo.build.dir}"/> <!-- Build the subdirs in opposite order. --> - <ant dir="argouml-app" inheritAll="false" target="clean"/> - <ant dir="argouml-core-model-euml" inheritAll="false" target="clean"/> - <ant dir="argouml-core-model-mdr" inheritAll="false" target="clean"/> - <ant dir="argouml-core-model" inheritAll="false" target="clean"/> - <ant dir="argouml-core-infra" inheritAll="false" target="clean"/> + <ant dir="../argouml-app" inheritAll="false" target="clean"/> + <ant dir="../argouml-core-model-euml" inheritAll="false" target="clean"/> + <ant dir="../argouml-core-model-mdr" inheritAll="false" target="clean"/> + <ant dir="../argouml-core-model" inheritAll="false" target="clean"/> + <ant dir="../argouml-core-infra" inheritAll="false" target="clean"/> </target> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
