svn commit: r14612 - trunk/build.xml

Author: linus
Date: 2008-05-04 07:26:41-0700
New Revision: 14612

Modified:
   trunk/build.xml

Log:
Fixed after the change of basedir in src/argouml-build/build.xml

Modified: trunk/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/build.xml?view=diff&rev=14612&p1=trunk/build.xml&p2=trunk/build.xml&r1=14611&r2=14612
==============================================================================
--- trunk/build.xml	(original)
+++ trunk/build.xml	2008-05-04 07:26:41-0700
@@ -38,13 +38,7 @@
   <!-- =================================================================== -->
   <target name="jar" depends="init"
           description="Build and copies files.">
-    <!--
-      This is how Linus Tolke would like to write this command:
     <ant dir="src/argouml-build" inheritAll="false"    target="package"/>
-      The corrected statement below works also with
-      src/argouml-build/build.xml that has basedir="..".
-     -->
-    <ant dir="src" antfile="argouml-build/build.xml" inheritAll="false" target="package"/>
   </target>
 
   <!-- =================================================================== -->
@@ -54,16 +48,7 @@
           description="">
     <mkdir dir="${build.dir}"/>
     <copy todir="${build.dir}" includeEmptyDirs="false">
-      <fileset dir="src/argouml-core-infra/build">
-        <include name="*"/>
-      </fileset>
-      <fileset dir="src/argouml-core-model/build">
-        <include name="*"/>
-      </fileset>
-      <fileset dir="src/argouml-core-model-mdr/build">
-        <include name="*"/>
-      </fileset>
-      <fileset dir="src/argouml-app/build">
+      <fileset dir="src/argouml-build/build">
         <include name="*"/>
       </fileset>
     </copy>
@@ -75,9 +60,6 @@
   <target name="clean" depends="init"
           description="Clean out all built files.">
     <delete dir="${build.dir}" quiet="true"/>
-    <!-- see above!
     <ant dir="src/argouml-build" inheritAll="false"    target="clean"/>
-     -->
-    <ant dir="src" antfile="argouml-build/build.xml" inheritAll="false" target="clean"/>
   </target>
 </project>