X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Fi18nAnt.xml;h=360a700277a992e88b7cd02e61198b7bde78a60b;hb=c6df3928336440918d23b4e7cb579f134e2f48dd;hp=47c404e0109b2e0134e89d9b8ad84bac9d5b734b;hpb=135900f9d1786cdffa0d05e062b3cfa478b0afa1;p=jalview.git

diff --git a/utils/i18nAnt.xml b/utils/i18nAnt.xml
index 47c404e..360a700 100755
--- a/utils/i18nAnt.xml
+++ b/utils/i18nAnt.xml
@@ -7,10 +7,14 @@
 
 <taskdef resource="net/sf/antcontrib/antcontrib.properties">
   <classpath>
-    <pathelement location="${basedir}/utils/ant-contrib-0.3.jar"/>
+    <pathelement location="${basedir}/utils/ant-contrib-1.0b3.jar"/>
+  </classpath>
+</taskdef>
+<taskdef resource="net/sf/antcontrib/antlib.xml">
+  <classpath>
+    <pathelement location="${basedir}/utils/ant-contrib-1.0b3.jar"/>
   </classpath>
 </taskdef>
-<taskdef resource="net/sf/antcontrib/antlib.xml"/>
  
 <target name="checkLang" description="Reports missing entries in language bundles compared to Message.properties">
 	<!-- adapted from http://stackoverflow.com/questions/14381660/ant-task-to-compare-two-properties-files -->
@@ -19,8 +23,7 @@
         var logger = project.getBuildListeners( ).firstElement( );
         logger.setMessageOutputLevel( 1 );
     </script>
-	<echo message="Missing message labels compared to Messages.properties"/>
-	<foreach target="compareProperties" param="file2">
+	<foreach target="compareBundles" param="file2">
 		<path>
 			<fileset dir="${basedir}/resources/lang">
 				<exclude name="Messages.properties" />
@@ -29,15 +32,28 @@
 	</foreach>
 </target>
 
+<target name="compareBundles" description="compare a properties file with Messages.properties and vice versa">
+	<echo message=" "/>
+	<echo message="Missing message labels in ${file2} compared to Messages.properties"/>
+	<antcall target="compareProperties">
+		<param name="file1" value="resources/lang/Messages.properties"/>
+		<param name="file2" value="${file2}" />
+	</antcall>
+	<echo message=" "/>
+	<echo message="Missing message labels in Messages.properties compare to ${file2}"/>
+	<antcall target="compareProperties">
+		<param name="file2" value="resources/lang/Messages.properties"/>
+		<param name="file1" value="${file2}" />
+	</antcall>
+</target>
+		
 <target name="compareProperties" description="reports missing entries in one message bundle">
-    <loadproperties srcFile="resources/lang/Messages.properties" prefix="prefixfile1"/>
+    <loadproperties srcFile="${file1}" prefix="prefixfile1"/>
     <loadproperties srcFile="${file2}" prefix="prefixfile2"/>
 
     <propertyselector property="file1.list" delimiter="," match="prefixfile1\.(.+)" select="\1"/>
     <propertyselector property="file2.list" delimiter="," match="prefixfile2\.(.+)" select="\1"/>
 	
-	<echo message=" "/>
-	<echo message="*** ${file2}:" />
     <for list="${file1.list}" param="file1.property">
         <sequential>
             <if>