JnetFIle is a readable format

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index d9253b0..aa0ca67 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -384,34 +384,70 @@
 
        <target name="castorbinding" depends="init" description="Generate Java bindings to supported Jalview XML models.">
                <taskdef name="castor-srcgen"
-                                 classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask"
-                             classpathref="build.classpath" />
+                         classname="org.castor.anttask.CastorCodeGenTask"
+                     classpathref="build.classpath" />
                <delete>
-                       <fileset dir="${sourceDir}/jalview/schemabinding/version2/">
-                               <filename name="*"/>
+                       <fileset dir="${sourceDir}/jalview/schemabinding/version2">
+                               <include name="*.java"/>
+                               <include name="descriptors/*.java"/>
                        </fileset>
                </delete>
                <castor-srcgen file="${schemaDir}/vamsas.xsd"
                              todir="${sourceDir}"
                              package="jalview.schemabinding.version2"
-                             warnings="true" 
+                             warnings="false" 
                                        nodesc="false"
+                                               verbose="true"
                                                properties="${schemaDir}/jalview.properties"
                />
                <castor-srcgen file="${schemaDir}/JalviewUserColours.xsd"
                              todir="${sourceDir}"
                              package="jalview.schemabinding.version2"
-                             warnings="true" 
+                             warnings="false" 
                                        nodesc="false"
+                                               verbose="true"
                                                properties="${schemaDir}/jalview.properties"
                />
                <castor-srcgen file="${schemaDir}/jalview.xsd"
                              todir="${sourceDir}"
                              package="jalview.schemabinding.version2"
-                             warnings="true" 
+                             warnings="false" 
                                          nodesc="false"
+                                               verbose="true"
                                                properties="${schemaDir}/jalview.properties"
                        
+               />
+               <!-- 
+               now build the jalview.binding package with the old schema set
+               -->
+               <delete>
+                       <fileset dir="${sourceDir}/jalview/binding/">
+                               <include name="**"/>
+                       </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"
        />
        </target>
 </project>