From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 9 Jan 2019 16:22:03 +0000 (+0000)
Subject: Merge branch 'feature/JAL-3063JAXB' into features/pca_jaxb_datasetrefs_JAL-3171_JAL... 
X-Git-Tag: Release_2_11_1_0~78^2~5
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3c8df820bf860dd6b0f48c877d94bc45d08e1944;hp=41d39ae9fa7cea070094d6e0230bca8c0cfba23a;p=jalview.git

Merge branch 'feature/JAL-3063JAXB' into features/pca_jaxb_datasetrefs_JAL-3171_JAL-3063_JAL-1767
---

diff --git a/.ant-targets-build.xml b/.ant-targets-build.xml
index 15432a1..ed220f3 100644
--- a/.ant-targets-build.xml
+++ b/.ant-targets-build.xml
@@ -9,6 +9,7 @@ compileApplet
 distclean
 help
 init
+jaxb-bindings
 linkcheck
 makeApplet
 makedist
diff --git a/build.xml b/build.xml
index 5ca105a..bed6d68 100755
--- a/build.xml
+++ b/build.xml
@@ -699,6 +699,50 @@
   <delete file="in.jar" />
 </target>
 
+<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/xml/binding/jalview">
+      <include name="*.java" />
+    </fileset>
+  </delete>
+  <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/xml/binding/uniprot">
+      <include name="*.java" />
+    </fileset>
+  </delete>
+
+  <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="castorbinding" depends="init" description="Generate Java bindings to supported Jalview XML models.">
   <taskdef name="castor-srcgen" classname="org.castor.anttask.CastorCodeGenTask" classpathref="build.classpath" />
   <delete>