svn commit: r18740 - trunk/src: argouml-build argouml-core-diagrams-state2

Author: linus
Date: 2010-09-15 10:01:35-0700
New Revision: 18740

Modified:
   trunk/src/argouml-build/build.xml
   trunk/src/argouml-core-diagrams-state2/   (props changed)

Log:
Included the argouml-core-diagrams-state2 in the releases.

Modified: trunk/src/argouml-build/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&pathrev=18740&r1=18739&r2=18740
==============================================================================
--- trunk/src/argouml-build/build.xml	(original)
+++ trunk/src/argouml-build/build.xml	2010-09-15 10:01:35-0700
@@ -242,8 +242,9 @@
     <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="install"/>
-    <ant dir="../argouml-app" inheritAll="false"               target="jar"/>
+    <ant dir="../argouml-app" inheritAll="false"                  target="jar"/>
 
+    <ant dir="../argouml-core-diagrams-state2" inheritAll="false" target="jar"/>
     <ant dir="../argouml-core-diagrams-sequence2" inheritAll="false" target="jar"/>
     <ant dir="../argouml-core-diagrams-activity2" inheritAll="false" target="jar"/>
     <ant dir="../argouml-core-umlpropertypanels" inheritAll="false" target="jar"/>
@@ -275,6 +276,9 @@
     </delete>
     <mkdir dir="${argo.build.dir}/ext"/>
     <copy todir="${argo.build.dir}/ext" includeEmptyDirs="false">
+      <fileset dir="../argouml-core-diagrams-state2/build">
+        <include name="*"/>
+      </fileset>
       <fileset dir="../argouml-core-diagrams-sequence2/build">
         <include name="*"/>
       </fileset>
@@ -360,6 +364,9 @@
     <ant dir="../argouml-core-model-mdr" inheritAll="false"    target="jar"/>
     <ant dir="../argouml-app" inheritAll="false"               target="jar"/>
 
+    <!-- Tests for state2 -->
+    <!-- Currently none. -->
+
     <!-- Tests for sequence2 -->
     <!-- Currently none. -->
 
@@ -396,9 +403,15 @@
       <fileset dir="../argouml-app">
         <include name="build/tests/reports/**/TEST-*.xml"/>
       </fileset>
+      <fileset dir="../argouml-core-diagrams-state2">
+        <include name="build/tests/reports/**/TEST-*.xml"/>
+      </fileset>
       <fileset dir="../argouml-core-diagrams-sequence2">
         <include name="build/tests/reports/**/TEST-*.xml"/>
       </fileset>
+      <fileset dir="../argouml-core-diagrams-activity2">
+        <include name="build/tests/reports/**/TEST-*.xml"/>
+      </fileset>
       <fileset dir="../argouml-core-umlpropertypanels">
         <include name="build/tests/reports/**/TEST-*.xml"/>
       </fileset>
@@ -454,6 +467,8 @@
          inheritAll="false"                                   target="clean"/>
     <ant dir="../argouml-core-diagrams-sequence2"
          inheritAll="false"                                   target="clean"/>
+    <ant dir="../argouml-core-diagrams-state2"
+         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"/>
@@ -496,7 +511,9 @@
         <pathelement location="../argouml-app/src"/>
         <pathelement location="../argouml-core-model/src"/>
         <pathelement location="../argouml-core-model-mdr/src"/>
+        <pathelement location="../argouml-core-diagrams-state2/src"/>
         <pathelement location="../argouml-core-diagrams-sequence2/src"/>
+        <pathelement location="../argouml-core-diagrams-activity2/src"/>
  	<pathelement location="../argouml-core-umlpropertypanels/src"/>
       </sourcepath>

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2660334

To unsubscribe from this discussion, e-mail: [[email protected]].