svn commit: r14145 - trunk/src: . app/src/templates

Author: linus
Date: 2008-02-22 08:51:06-0800
New Revision: 14145

Modified:
   trunk/src/app/src/templates/manifest.template
   trunk/src/build.xml

Log:
Fixed the manifest to be able to run from the jar file.

Modified: trunk/src/app/src/templates/manifest.template
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/templates/manifest.template?view=diff&rev=14145&p1=trunk/src/app/src/templates/manifest.template&p2=trunk/src/app/src/templates/manifest.template&r1=14144&r2=14145
==============================================================================
--- trunk/src/app/src/templates/manifest.template	(original)
+++ trunk/src/app/src/templates/manifest.template	2008-02-22 08:51:06-0800
@@ -1,6 +1,5 @@
 Manifest-Version: 2.0
 Main-Class: org.argouml.application.Main
-Class-Path: argouml-model.jar ocl-argo.jar gef.jar antlrall.jar log4j.jar toolbar.jar swidgets.jar commons-logging.jar ext/argouml-i18n-de.jar ext/argouml-i18n-en_GB.jar ext/argouml-i18n-es.jar ext/argouml-i18n-fr.jar ext/argouml-i18n-it.jar ext/argouml-i18n-nb.jar ext/argouml-i18n-pt.jar ext/argouml-i18n-ru.jar ext/argouml-i18n-sv.jar ext/argouml-i18n-zh.jar argouml-mdr.jar java-interfaces.jar jmi.jar jmiutils.jar mdrapi.jar mof.jar nbmdr.jar openide-util.jar ext/dev.jar
 Created-By: 1.2 (Sun Microsystems Inc.) 
 
 Name: org/argouml/application/

Modified: trunk/src/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/build.xml?view=diff&rev=14145&p1=trunk/src/build.xml&p2=trunk/src/build.xml&r1=14144&r2=14145
==============================================================================
--- trunk/src/build.xml	(original)
+++ trunk/src/build.xml	2008-02-22 08:51:06-0800
@@ -309,6 +309,39 @@
         <include name="*"/>
       </fileset>
     </copy>
+
+    <!-- The argouml.jar is copied again and again since it is modified below -->
+    <copy todir="${argo.build.dir}" overwrite="on">
+      <fileset dir="app/build">
+        <include name="argouml.jar"/>
+      </fileset>
+    </copy>
+
+    <!-- Update the manifest file. -->
+    <property name="manifest.update" value="mf.mf"/>
+    <exec executable="sh">
+      <arg value="-c"/>
+      <arg value="( cd ../build; echo Class-Path: &#042;.jar ext/&#042;.jar > ${manifest.update} )"/>
+    </exec>
+
+    <!--
+    <exec executable="sh">
+      <arg value="-c"/>
+      <arg value="( cd ../build; $JAVA_HOME/bin/jar ufm argouml.jar mf.mf )"/>
+    </exec>
+    -->
+
+    <jar update="true"
+         basedir="${argo.build.dir}"
+         includes="no-files"
+         manifest="${argo.build.dir}/${manifest.update}"
+         jarfile="${argo.build.dir}/argouml.jar"/>
+
+    <delete>
+      <fileset dir="${argo.build.dir}">
+        <include name="${manifest.update}"/>
+      </fileset>
+    </delete>
   </target>
 
 
@@ -330,6 +363,7 @@
   </target>  
 
   <target name="tests-reports" depends="init">
+    <delete dir="${tests.reports}"/>
     <mkdir dir="${tests.reports}"/>
 
     <junitreport todir="${tests.reports}">