svn commit: r14601 - trunk/src/argouml-build/build.xml

Author: linus
Date: 2008-05-03 10:19:58-0700
New Revision: 14601

Modified:
   trunk/src/argouml-build/build.xml

Log:
Fix the tests-reports target that pulls all results together.
Fixed the javadocs and javadocs-api targets.

Modified: trunk/src/argouml-build/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&rev=14601&p1=trunk/src/argouml-build/build.xml&p2=trunk/src/argouml-build/build.xml&r1=14600&r2=14601
==============================================================================
--- trunk/src/argouml-build/build.xml	(original)
+++ trunk/src/argouml-build/build.xml	2008-05-03 10:19:58-0700
@@ -329,8 +329,20 @@
     <mkdir dir="${tests.reports}"/>
 
     <junitreport todir="${tests.reports}">
-      <fileset dir=".">
-        <include name="*/build/tests/reports/**/TEST-*.xml"/>
+      <fileset dir="../argouml-core-infra">
+        <include name="build/tests/reports/**/TEST-*.xml"/>
+      </fileset>
+      <fileset dir="../argouml-core-model">
+        <include name="build/tests/reports/**/TEST-*.xml"/>
+      </fileset>
+      <fileset dir="../argouml-core-model-mdr">
+        <include name="build/tests/reports/**/TEST-*.xml"/>
+      </fileset>
+      <fileset dir="../argouml-core-model-euml">
+        <include name="build/tests/reports/**/TEST-*.xml"/>
+      </fileset>
+      <fileset dir="../argouml-app">
+        <include name="build/tests/reports/**/TEST-*.xml"/>
       </fileset>
       <report format="frames" todir="${tests.reports}/html"/>
     </junitreport>
@@ -378,7 +390,7 @@
              bottom="&lt;table width=&apos;100%&apos;&gt;&lt;tr&gt;&lt;td width=&apos;25%&apos; align=&apos;left&apos;&gt;ArgoUML &amp;copy; 1996-2006&lt;/td&gt;&lt;td width=&apos;25%&apos; align=&apos;center&apos;&gt;&lt;a href=&apos;http://argouml.tigris.org/&apos; target=&apos;_blank&apos;&gt;ArgoUML Homepage&lt;/a&gt;&lt;/td&gt;&lt;td width=&apos;25%&apos; align=&apos;center&apos;&gt;&lt;a href=&apos;http://argouml.tigris.org/dev.html&apos; target=&apos;_blank&apos;&gt;ArgoUML Developers' page&lt;/a&gt;&lt;/td&gt;&lt;td width=&apos;25%&apos; align=&apos;right&apos;&gt;&lt;a href=&apos;http://argouml.tigris.org/documentation/defaulthtml/cookbook/&apos; target=&apos;_blank&apos;&gt;ArgoUML Cookbook&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;"
              destdir="${argo.javadocs.dir}"
              maxmemory="128M"
-             overview="argouml-app/src/org/argouml/overview-argo.html"
+             overview="../argouml-app/src/org/argouml/overview-argo.html"
              packagenames="org.argouml.*"
              source="1.5"
              splitindex="${javadoc.splitindex}"
@@ -386,9 +398,9 @@
              windowtitle="ArgoUML Javadoc for internal use">
       <tag name="stereotype"/>
       <sourcepath>
-        <pathelement location="argouml-app/src"/>
-        <pathelement location="argouml-core-model/src"/>
-        <pathelement location="argouml-core-model-mdr/src"/>
+        <pathelement location="../argouml-app/src"/>
+        <pathelement location="../argouml-core-model/src"/>
+        <pathelement location="../argouml-core-model-mdr/src"/>
       </sourcepath>
 
       <classpath>
@@ -415,7 +427,7 @@
     </javadoc>
 
     <copy todir="${argo.javadocs.dir}/org/argouml/doc-files">
-      <fileset dir="argouml-app/src/org/argouml/doc-files">
+      <fileset dir="../argouml-app/src/org/argouml/doc-files">
         <include name="*.gif"/>
       </fileset>
     </copy>
@@ -433,7 +445,7 @@
              bottom="&lt;table width=&apos;100%&apos;&gt;&lt;tr&gt;&lt;td width=&apos;33%&apos; align=&apos;left&apos;&gt;ArgoUML &amp;copy; 1996-2006&lt;/td&gt;&lt;td width=&apos;34%&apos; align=&apos;center&apos;&gt;&lt;a href=&apos;http://argouml.tigris.org/&apos; target=&apos;_blank&apos;&gt;ArgoUML Homepage&lt;/a&gt;&lt;/td&gt;&lt;td width=&apos;33%&apos; align=&apos;right&apos;&gt;&lt;a href=&apos;http://argouml.tigris.org/documentation/defaulthtml/cookbook/&apos; target=&apos;_blank&apos;&gt;ArgoUML Cookbook&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;"
              destdir="${argo.api.dir}"
              maxmemory="128M"
-             overview="argouml-app/src/org/argouml/overview-api.html"
+             overview="../argouml-app/src/org/argouml/overview-api.html"
              packagenames="org.argouml.model,org.argouml.cognitive,org.argouml.uml.reveng,org.argouml.application,org.argouml.i18n,org.argouml.ui,org.argouml.ui.explorer,org.argouml.ocl,org.argouml.moduleloader"
              source="1.5"
              private="false"
@@ -442,8 +454,8 @@
              windowtitle="ArgoUML Javadoc for ArgoUML Module Developers">
       <tag name="stereotype"/>
       <sourcepath>
-        <pathelement location="argouml-app/src"/>
-        <pathelement location="argouml-core-model/src"/>
+        <pathelement location="../argouml-app/src"/>
+        <pathelement location="../argouml-core-model/src"/>
       </sourcepath>
 
       <classpath>
@@ -471,7 +483,7 @@
     </javadoc>
 
     <copy todir="${argo.api.dir}/org/argouml/doc-files">
-      <fileset dir="argouml-app/src/org/argouml/doc-files">
+      <fileset dir="../argouml-app/src/org/argouml/doc-files">
         <include name="*.gif"/>
       </fileset>
     </copy>