X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=4c5c5030a56294c28eeb1524840b52f9a2bd9490;hb=95b3faa01eafb33d560aa76eba9484e4b39e5a40;hp=4eb62438fffd44fb77ab0f6f926d78408791d7ea;hpb=c43b50d315d9034614357fb03618f2a4ec6655ec;p=jalview.git

diff --git a/build.xml b/build.xml
index 4eb6243..4c5c503 100755
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-  <project name="jalviewX" default="build" basedir=".">
+  <project name="jalviewX" default="usage" basedir=".">
 <!-- we use jalopy to format our sources -->
 <taskdef name="jalopy"
          classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
@@ -10,6 +10,18 @@
   </classpath>
 </taskdef>
 
+   <target name="usage">
+     <echo message="~~~Jalview Ant build.xml Usage~~~~"/>
+     <echo message="Targets available:"/>
+     <echo message="usage - default target, displays this message"/>
+     <echo message="buildindices - generates JavaHelpSearch from the help files"/>
+     <echo message="build - compiles all necessary files for Application"/>
+     <echo message="makedist - compiles and places all necessary jar files into directory dist"/>
+     <echo message="makefulldist - signs all jar files and builds jnlp file for full distribution"/>
+     <echo message="compileApplet - compiles all necessary files for Applet"/>
+     <echo message="makeApplet - compiles, then packages and obfuscates the Applet"/>
+   </target>
+
 
     <!-- utils is a class path to additional utilities needed for
     building docs, jars and webstart stuff -->
@@ -38,7 +50,7 @@
         </fileset> -->
       </path>
 
-      <property name="JALVIEW_VERSION" value="2.03"/>
+      <property name="JALVIEW_VERSION" value="ANNOTATION_TEST"/>
       <property name="" value=""/>
       <property name="libDir" value="lib"/>
       <property name="resourceDir" value="resources"/>
@@ -85,7 +97,7 @@
     <taskdef classpath="utils/roxes-ant-tasks-1.2-2004-01-30.jar" resource="com/roxes/tools/ant/taskdefs.properties"/>
     <target name="buildPropertiesFile" depends="init">
       <tstamp prefix="build">
-        <format property="date" pattern="dd MMMM yyyy hh.mm aa"/>
+        <format property="date" pattern="dd MMMM yyyy"/>
       </tstamp>
       <properties file="${outputDir}/.build_properties">
         <header>
@@ -156,27 +168,8 @@
     </java>
     </target>
 
-    <target name="makejars" depends="build, buildPropertiesFile, buildindices">
-      <!-- make the package jar -->
-      <mkdir dir="${packageDir}"/>
-
-      <jar destfile="${packageDir}/${outputJar}">
-        <fileset dir="${outputDir}/">
-          <exclude name="cache*/**"/>
-          <exclude name="*.jar" />
-          <exclude name="*.jar.*" />
-          <exclude name="**/*.jar" />
-          <exclude name="**/*.jar.*" />
-        </fileset>
-      </jar>
-
-      <copy toDir="${packageDir}" flatten="true">
-        <fileset dir="${outputDir}">
-          <include name="*.jar"/>
-          <include name="**/*.jar"/>
-        </fileset>
-      </copy>
-<!-- the default keystore details might need to be edited here -->
+    <target name="makefulldist" depends="makedist">
+ <!-- the default keystore details might need to be edited here -->
       <signjar
       storepass="alignmentisfun"
       keypass="alignmentisfun"
@@ -286,8 +279,35 @@
         package="${wsdl.ClientNS}"/>
         </mappingSet>
     </axis-wsdl2java>
+    </target>
 
+    <target name="makedist" depends="build, buildPropertiesFile, buildindices">
+      <!-- make the package jar -->
+      <mkdir dir="${packageDir}"/>
+
+      <jar destfile="${packageDir}/${outputJar}">
+        <manifest>
+             <attribute name="Main-Class" value="jalview.bin.Jalview"/>
+        </manifest>
+        <fileset dir="${outputDir}/">
+          <exclude name="cache*/**"/>
+          <exclude name="*.jar" />
+          <exclude name="*.jar.*" />
+          <exclude name="**/*.jar" />
+          <exclude name="**/*.jar.*" />
+        </fileset>
+      </jar>
+
+      <copy toDir="${packageDir}" flatten="true">
+        <fileset dir="${outputDir}">
+          <include name="*.jar"/>
+          <include name="**/*.jar"/>
+        </fileset>
+      </copy>
   </target>
+
+
+
   <target name="package" depends="init, build">
 
   </target>
@@ -316,12 +336,17 @@
   </target>
 
   <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
+  <copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif"/>
        <jar destfile="in.jar">
+        <manifest>
+            <attribute name="Main-Class" value="jalview.bin.JalviewLite"/>
+        </manifest>
         <fileset dir="${outputDir}">
           <include name="com/**"/>
+          <include name="MCview/**"/>
           <include name="jalview/**"/>
           <include name=".build_properties"/>
-          <include name="${resourceDir}/images/idwidth.gif"/>
+          <include name="images/idwidth.gif"/>
         </fileset>
       </jar>
   </target>
@@ -333,6 +358,7 @@
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
+       { public * ; }
     </proguard>
     <delete file="in.jar"/>
   </target>