svn commit: r16454 - trunk: . src/argouml-build src/argouml-core-diagrams-sequence2

Author: linus
Date: 2008-12-29 13:32:30-0800
New Revision: 16454

Modified:
   trunk/build.xml
   trunk/src/argouml-build/build.xml
   trunk/src/argouml-core-diagrams-sequence2/build.xml

Log:
Enable the sequence2 diagrams module.

Modified: trunk/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/build.xml?view=diff&pathrev=16454&r1=16453&r2=16454
==============================================================================
--- trunk/build.xml	(original)
+++ trunk/build.xml	2008-12-29 13:32:30-0800
@@ -53,14 +53,12 @@
       </fileset>
     </copy>
 
-<!--
     <mkdir dir="${build.dir}/ext"/>
     <copy todir="${build.dir}/ext" includeEmptyDirs="false">
       <fileset dir="src/argouml-build/build/ext">
         <include name="*"/>
       </fileset>
     </copy>
- -->
   </target>
 
 

Modified: trunk/src/argouml-build/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&pathrev=16454&r1=16453&r2=16454
==============================================================================
--- trunk/src/argouml-build/build.xml	(original)
+++ trunk/src/argouml-build/build.xml	2008-12-29 13:32:30-0800
@@ -246,9 +246,7 @@
 -->
     <ant dir="../argouml-app" inheritAll="false"               target="jar"/>
 
-<!--
     <ant dir="../argouml-core-diagrams-sequence2" inheritAll="false" target="jar"/>
--->
 
     <!-- Copy everything to the build directory -->
     <mkdir dir="${argo.build.dir}"/>
@@ -269,7 +267,6 @@
       </fileset>
     </copy>
 
-<!--
     <delete failonerror="false">
       <fileset dir="${argo.build.dir}/ext"/>
     </delete>
@@ -279,7 +276,6 @@
         <include name="*"/>
       </fileset>
     </copy>
- -->
 
     <!-- The argouml.jar is copied again and again since it is modified below -->
     <copy todir="${argo.build.dir}" overwrite="on">
@@ -342,14 +338,12 @@
          target="${tests-to-do}"/>
 
     <!-- Tests for sequence2 -->
-<!--
     <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-app" inheritAll="false"               target="jar"/>
     <ant dir="../argouml-core-diagrams-sequence2" inheritAll="false"
          target="${tests-to-do}"/>
--->
 
     <antcall target="tests-reports"/>
   </target>  
@@ -374,11 +368,9 @@
       <fileset dir="../argouml-app">
         <include name="build/tests/reports/**/TEST-*.xml"/>
       </fileset>
-<!--
       <fileset dir="../argouml-core-diagrams-sequence2">
         <include name="build/tests/reports/**/TEST-*.xml"/>
       </fileset>
--->
       <report format="frames" todir="${tests.reports}/html"/>
     </junitreport>
   </target>
@@ -416,10 +408,8 @@
     <delete dir="${argo.build.dir}"/>
 
     <!-- Build the subdirs in opposite order. -->
-<!--
     <ant dir="../argouml-core-diagrams-sequence2"
          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"/>
@@ -462,9 +452,7 @@
         <pathelement location="../argouml-app/src"/>
         <pathelement location="../argouml-core-model/src"/>
         <pathelement location="../argouml-core-model-mdr/src"/>
-<!--
         <pathelement location="../argouml-core-diagrams-sequence2/src"/>
--->
       </sourcepath>
 
       <classpath>

Modified: trunk/src/argouml-core-diagrams-sequence2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/build.xml?view=diff&pathrev=16454&r1=16453&r2=16454
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/build.xml	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/build.xml	2008-12-29 13:32:30-0800
@@ -142,6 +142,7 @@
     <jar basedir="build/classes"
          excludes="*.txt,*.bat,*.xml,*.sh" 
          includes="org/argouml/**"
+         manifest="src/META-INF/MANIFEST.MF"
 	 jarfile="build/argouml-diagrams-sequence.jar" />
   </target>

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

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