X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=8d2cd7d9f798929ee86815298475df27aebfe16c;hb=159718305a909dcc33f6cf5a2955a79d297caafd;hp=f6fb5d7150ec6e3b7aa3d1cf1db6630f370e5efc;hpb=fab0afc9e1e7a5ca460f0cbd48545536f989a435;p=jalview.git

diff --git a/build.xml b/build.xml
index f6fb5d7..8d2cd7d 100755
--- a/build.xml
+++ b/build.xml
@@ -128,7 +128,7 @@
     <property name="applet.caller-codebase" value="${applet.codebase}" />
 
     <!-- build directory configuration -->
-    <property name="libDir" value="lib" />
+    <property name="libDir" value="j11lib" />
     <property name="resourceDir" value="resources" />
     <property name="helpDir" value="help" />
     <property name="docDir" value="doc" />
@@ -148,6 +148,7 @@
     <property name="reportDir" value="test-reports" />
     <property name="testDir" value="test" />
     <property name="testOutputDir" value="tests" />
+  	<property name="cloverOutputDir" value="clover" if:set="clover.jar" />
     <!-- switch to indicate if we should obfuscate jalviewLite -->
     <!-- <property name="donotobfuscate" value="true"/> -->
     <!-- switch to exclude associations from generated jnlp files -->
@@ -272,6 +273,7 @@
         <include name="**/*.*" />
       </fileset>
     </copy>
+  	<mkdir dir="${cloverOutputDir}" if:set="clover.jar"/>
   </target>
 
   <target name="build" depends="prepare">
@@ -701,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/binding/">
-      <include name="**" />
+    <fileset dir="${sourceDir}/jalview/xml/binding/embl">
+      <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}/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="sourcedist" description="create jalview source distribution" depends="init">
   <delete file="${source.dist.name}" />
   <!-- temporary copy of source to update timestamps -->
@@ -960,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" />
@@ -1001,12 +1024,16 @@
 </target>
 
 <target name="eclipse-install" depends="init,prepare">
-
+<!--
   <property name="eclipseTempFile" value="eclipse-jee-oxygen-R-linux-gtk-x86_64.tar.gz"/>
   <property name="eclipseInstallURL" value="http://mirror.csclub.uwaterloo.ca/eclipse/technology/epp/downloads/release/oxygen/R/eclipse-jee-oxygen-R-linux-gtk-x86_64.tar.gz"/>
   <property name="java2scriptURL" value="https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar?raw=true"/>
+-->
+  <property name="eclipseTempFile" value="eclipse-jee-2019-06-R-linux-gtk-x86_64.tar.gz"/>
+  <property name="eclipseInstallURL" value="http://ftp.fau.de/eclipse/technology/epp/downloads/release/2019-06/R/eclipse-jee-2019-06-R-linux-gtk-x86_64.tar.gz"/>
+  <property name="java2scriptURL" value="https://github.com/BobHanson/java2script/raw/master/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar"/>
 
-  <get url="${eclipseInstallURL}" dest="${eclipseTempFile}"/>
+  <get src="${eclipseInstallURL}" dest="${eclipseTempFile}"/>
   <untar compression="gzip" src="${eclipseTempFile}" dest="${eclipse-inst}"/>
 
   <!-- not needed since we ship transpiler with source
@@ -1014,8 +1041,7 @@
 
 </target>
 
-<target name="build-site" depends="init,prepare,compile-site,unzip-to-site">
-  <!-- closure compile -->
+<target name="build-site" depends="init,prepare,compile-site,unzip-to-site,make-j2s-cores">
   <!-- tarball -->
   <tar compression="gzip" destfile="site.tar.gz">
     <tarfileset dir="site" />
@@ -1093,29 +1119,10 @@
   </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="">
+    <ant antfile="buildcore.xml" target="build-all-cores"/>
+  </target>
 </project>