X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=0226383a27c2bf0072938238e2faac5a10e1c022;hb=8c0f35fa0bee850e670c157157cc335d8a1a49ae;hp=ae21307b7e9bcaa98ad584b2f049c2ffc06d3cca;hpb=17113870b62307e2a3cc4759b85c954a44710e42;p=jalview.git

diff --git a/build.xml b/build.xml
index ae21307..0226383 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,21 @@
   </classpath>
 </taskdef>
 
+   <target name="help" depends="usage"/>
+   <target name="usage">
+     <echo message="~~~Jalview Ant build.xml Usage~~~~"/>
+     <echo message="Targets include:"/>
+     <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="              this needs a keystore and key. See docs/building.html for more information."/>
+     <echo message="compileApplet - compiles all necessary files for Applet"/>
+     <echo message="makeApplet - compiles, then packages and obfuscates the Applet"/>
+     <echo message="See docs/building.html and the comments in build file for other targets."/>
+   </target>
+
 
     <!-- utils is a class path to additional utilities needed for
     building docs, jars and webstart stuff -->
@@ -37,9 +52,12 @@
           <include name="*.jar"/>
         </fileset> -->
       </path>
-
-      <property name="JALVIEW_VERSION" value="2.07"/>
-      <property name="" value=""/>
+      <!-- Jalview Version String displayed by application on startup and used to check for updates -->
+      <property name="JALVIEW_VERSION" value="2.2"/>
+      <!-- Don't change anything below here unless you know what you are doing! -->
+      <!-- Url path for WebStart in JNLP file -->
+      <property name="WebStartLocation" value="http://www.jalview.org/webstart"/>
+      <!-- build directory configuration -->
       <property name="libDir" value="lib"/>
       <property name="resourceDir" value="resources"/>
       <property name="helpDir" value="help"/>
@@ -48,16 +66,15 @@
       <property name="outputDir" value="classes" />
       <property name="packageDir" value="dist" />
       <property name="outputJar" value="jalview.jar" />
+      <!-- Jalview Web Service Clients - see the comments in 'buildextclients' for details -->
       <property name="wsdl.File" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred?wsdl" />
       <property name="wsdl.Files" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/vamsas?wsdlFiles" />
       <property name="wsdl.MsaWS" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/MuscleWS?wsdl" />
       <property name="wsdl.MsaWS2" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/ClustalWS?wsdl" />
-      <property name="wsdl.MsaWS2" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/ClustalWS?wsdl" />
-        <property name="WSInterf" value="MsaWS" />
-      <property name="WebStartLocation" value="http://www.jalview.org/webstart"/>
+      <property name="WSInterf" value="MsaWS" />
       <property name="wsdl.Namespace" value="vamsas" />
       <property name="wsdl.ClientNS" value="ext.vamsas" />
-
+      <!-- the class path for building the application -->
       <path id="build.classpath">
         <fileset dir="utils">
           <include name="*.jar"/>
@@ -67,18 +84,7 @@
           <include name="*.jar"/>
           <include name="**/*.jar"/>
         </fileset>
-<!--        <fileset dir="old_lib_signed">
-<include name="lib_axis.jar"/>
-
-        </fileset>-->
       </path>
-      <!-->    <uptodate property="help.uptodate"
-      targetfile="${helpDir}/helpIndex.xml">
-      <srcfiles
-                 dir="${helpDir}"
-                 includes="**/*.html" />
-               </uptodate>
-      -->
     </target>
 
 
@@ -156,30 +162,8 @@
     </java>
     </target>
 
-    <target name="makejars" 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>
-<!-- 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"
@@ -249,6 +233,18 @@
     </target>
 
     <target name="buildextclients" depends="init">
+      <input message="Building external client source from WSDLs - Do you really want to do this ? (Yy/Nn)"
+      validargs="Y,y,n,N" defaultvalue="N"
+      addproperty="doextbuild.response"/>
+      <condition property="dontextbuild">
+        <equals arg1="n" arg2="${doextbuild.response}"/>
+      </condition>
+      <condition property="dontextbuild">
+        <equals arg1="N" arg2="${doextbuild.response}"/>
+      </condition>
+      <fail if="dontextbuild">
+        Build External Client Code process aborted by user. Jalview source is unchanged.
+      </fail>
 <!-- Currently, this doesn't happen automatically.
      1. Run WSDL2Java as below, which generates an ext.vamsas +
      vamsas.<datapackages> fileset.
@@ -260,7 +256,6 @@
 
 -->
       <path id="axisbuild">
-        <!--        <path refid="axis.classpath"/> -->
         <path refid="build.classpath"/>
       </path>
       <taskdef resource="axis-tasks.properties" classpathref="axisbuild"/>
@@ -289,11 +284,34 @@
         package="${wsdl.ClientNS}"/>
         </mappingSet>
     </axis-wsdl2java>
+    </target>
 
-  </target>
-  <target name="package" depends="init, build">
+    <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>
+
+
   <!-- jalopy code reformatter -->
   <target name="sourcescrub" depends="init,build">
     <jalopy destdir="jsrc" classpathref="run.classpath"
@@ -320,6 +338,7 @@
 
   <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
   <copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif"/>
+  <copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif"/>
        <jar destfile="in.jar">
         <manifest>
             <attribute name="Main-Class" value="jalview.bin.JalviewLite"/>
@@ -330,6 +349,7 @@
           <include name="jalview/**"/>
           <include name=".build_properties"/>
           <include name="images/idwidth.gif"/>
+          <include name="images/link.gif"/>
         </fileset>
       </jar>
   </target>