X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=775df8d51fead2c87199e6d1e140d48f72dc3d90;hb=151d33d3523dbe4cf85efb167f421e916c8d7e7f;hp=b1abce95c33b7a6e11c3dfae8c9909f44dae78fd;hpb=b4577fdd53b3c1e13411a657a81a6bb6c7fe918b;p=jalview.git

diff --git a/build.xml b/build.xml
index b1abce9..775df8d 100755
--- a/build.xml
+++ b/build.xml
@@ -703,30 +703,50 @@
   <delete file="in.jar" />
 </target>
 
-<target name="castorbinding" depends="init" description="Generate Java bindings to supported Jalview XML models.">
-  <taskdef name="castor-srcgen" classname="org.castor.anttask.CastorCodeGenTask" classpathref="build.classpath" />
+<target name="jaxb-bindings" depends="init" description="Generates JAXB bindings for supported Jalview XML models (needs xjc on the path)">
   <delete>
-    <fileset dir="${sourceDir}/jalview/schemabinding/version2">
+    <fileset dir="${sourceDir}/jalview/xml/binding/jalview">
       <include name="*.java" />
-      <include name="descriptors/*.java" />
     </fileset>
   </delete>
-  <castor-srcgen file="${schemaDir}/vamsas.xsd" todir="${sourceDir}" package="jalview.schemabinding.version2" warnings="false" nodesc="false" verbose="true" properties="${schemaDir}/jalview.properties" />
-  <castor-srcgen file="${schemaDir}/JalviewUserColours.xsd" todir="${sourceDir}" package="jalview.schemabinding.version2" warnings="false" nodesc="false" verbose="true" properties="${schemaDir}/jalview.properties" />
-  <castor-srcgen file="${schemaDir}/JalviewWsParamSet.xsd" todir="${sourceDir}" package="jalview.schemabinding.version2" warnings="false" nodesc="false" verbose="true" properties="${schemaDir}/jalview.properties" />
-  <castor-srcgen file="${schemaDir}/jalview.xsd" todir="${sourceDir}" package="jalview.schemabinding.version2" warnings="false" nodesc="false" verbose="true" properties="${schemaDir}/jalview.properties" />
-  <!-- 
-		now build the jalview.binding package with the old schema set
-		-->
+  <exec executable="xjc">
+    <arg value="${schemaDir}/jalview.xsd"/>
+    <arg value="-d"/>
+    <arg value="${sourceDir}"/>
+    <arg value="-p"/>
+    <arg value="jalview.xml.binding.jalview"/>
+  </exec>
+  <delete>
+    <fileset dir="${sourceDir}/jalview/xml/binding/embl">
+      <include name="*.java" />
+    </fileset>
+  </delete>
+
+  <exec executable="xjc">
+    <arg value="${schemaDir}/embl.xsd"/>
+    <arg value="-d"/>
+    <arg value="${sourceDir}"/>
+    <arg value="-b"/>
+    <arg value="${schemaDir}/embl_bindings.xml"/>
+    <arg value="-p"/>
+    <arg value="jalview.xml.binding.embl"/>
+  </exec>
+
   <delete>
-    <fileset dir="${sourceDir}/jalview/binding/">
-      <include name="**" />
+    <fileset dir="${sourceDir}/jalview/xml/binding/uniprot">
+      <include name="*.java" />
     </fileset>
   </delete>
-  <castor-srcgen file="${schemaDir}/vamsasJvV1.xsd" todir="${sourceDir}" package="jalview.binding" warnings="false" nodesc="true" verbose="true" properties="${schemaDir}/jalview.nodesc.properties" />
-  <castor-srcgen file="${schemaDir}/JalviewUserColours.xsd" todir="${sourceDir}" package="jalview.binding" warnings="false" nodesc="true" verbose="true" properties="${schemaDir}/jalview.nodesc.properties" />
-  <castor-srcgen file="${schemaDir}/jalviewJvV1.xsd" todir="${sourceDir}" package="jalview.binding" warnings="false" nodesc="true" verbose="true" properties="${schemaDir}/jalview.nodesc.properties" />
+
+  <exec executable="xjc">
+    <arg value="${schemaDir}/uniprot.xsd"/>
+    <arg value="-d"/>
+    <arg value="${sourceDir}"/>
+    <arg value="-p"/>
+    <arg value="jalview.xml.binding.uniprot"/>
+  </exec>
 </target>
+
 <target name="sourcedist" description="create jalview source distribution" depends="init">
   <delete file="${source.dist.name}" />
   <!-- temporary copy of source to update timestamps -->
@@ -962,8 +982,9 @@
 </target>
 
 <target name="signApplet" description="internal target to sign applet" depends="-signappletnotsa,-signapplettsa" />
+<target name="pubapplet" description="Dummy target to keep legacy Jalview build system happy. We don't actually publish the applet anymore."/>
 
-<target name="pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
+<target name="_pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
 
   <!-- bizarre bug causes JmolApplet to always get signed, even if excluded from above. so copy explicitly -->
   <copy file="appletlib/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
@@ -1094,30 +1115,7 @@
   </copy>
 </target>
 <target name="unzip-to-site" depends="prepare-site">
-  <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
-  <unzip dest="${site}/" overwrite="true">
-    <fileset dir="libjs">
-      <include name="*.zip" />
-    </fileset>
-  </unzip>
-  <copy overwrite="true" todir="${site}/swingjs/j2s/">
-    <fileset dir="${resourceDir}">
-      <include name="**"/>
-    </fileset>
-  </copy>
-
-  <!-- copy test files into place in site -->
-  <copy todir="${site}/examples">
-    <fileset dir="examples">
-      <include name="*.*"/>
-    </fileset>
-  </copy>
-  <!-- lastly, update SwingJS -->
-  <unzip dest="${site}/" overwrite="true">
-    <fileset dir="${swingjsdir}">
-      <include name="SwingJS-site.zip"/>
-    </fileset>
-  </unzip>
+  <ant antfile="build-site.xml"/>
 </target>
 
   <target name="make-j2s-cores" depends="">