svn commit: r14884 - trunk: . src/argouml-build

Author: dthompson
Date: 2008-06-07 15:07:54-0700
New Revision: 14884

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

Log:
Issue 5068: Added code to build.xml to update argouml.jar manifest, explicitly listing all ext/xxx.jar files rather than using "ext/*.jar".  Note: requires ext/ to be populated before calling "install" target.

Modified: trunk/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/build.xml?view=diff&rev=14884&p1=trunk/build.xml&p2=trunk/build.xml&r1=14883&r2=14884
==============================================================================
--- trunk/build.xml	(original)
+++ trunk/build.xml	2008-06-07 15:07:54-0700
@@ -42,7 +42,7 @@
   </target>
 
   <!-- =================================================================== -->
-  <!-- Make sure the files are in build                                    -->
+  <!-- Copy files from argouml/src/argouml-build to argouml/build          -->
   <!-- =================================================================== -->
   <target name="install" depends="init, jar"
           description="">
@@ -52,6 +52,30 @@
         <include name="*"/>
       </fileset>
     </copy>
+
+    <!-- update argouml.jar manifest with any jars found in new location 
+     (i.e. include anything in ext/*.jar -->
+    <property name="manifest.update" value="mf.mf"/>
+    <fileset dir="${build.dir}" id="classpath.jars" >
+        <include name="**/*.jar" />
+    </fileset>
+    <pathconvert pathsep=" " property="cp" refid="classpath.jars" >
+      <mapper>
+        <globmapper from="${basedir}${file.separator}${build.dir}${file.separator}*" to="*"/>
+        <globmapper from="${basedir}${file.separator}${build.dir}${file.separator}ext${file.separator}*" to="ext${file.separator}*"/> 
+      </mapper>
+    </pathconvert>
+    <echo message="Class-Path: ${cp}" file="${build.dir}/${manifest.update}" />
+    <jar update="true"
+         basedir="${build.dir}"
+         includes="no-files"
+         manifest="${build.dir}/${manifest.update}"
+         jarfile="${build.dir}/argouml.jar"/>
+    <delete>
+      <fileset dir="${build.dir}">
+        <include name="${manifest.update}"/>
+      </fileset>
+    </delete>    
   </target>
 
   <!-- =================================================================== -->

Modified: trunk/src/argouml-build/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&rev=14884&p1=trunk/src/argouml-build/build.xml&p2=trunk/src/argouml-build/build.xml&r1=14883&r2=14884
==============================================================================
--- trunk/src/argouml-build/build.xml	(original)
+++ trunk/src/argouml-build/build.xml	2008-06-07 15:07:54-0700
@@ -280,7 +280,7 @@
     <pathconvert pathsep=" " property="cp" refid="classpath.jars" >
         <mapper type="flatten"/>
     </pathconvert>
-    <echo message="Class-Path: ${cp} ext/*.jar" file="${argo.build.dir}/${manifest.update}" />
+    <echo message="Class-Path: ${cp}" file="${argo.build.dir}/${manifest.update}" />
 
     <jar update="true"
          basedir="${argo.build.dir}"