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

diff --git a/utils/i18nAnt.xml b/utils/i18nAnt.xml
index eaabc47..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,7 +23,7 @@
         var logger = project.getBuildListeners( ).firstElement( );
         logger.setMessageOutputLevel( 1 );
     </script>
-	<foreach target="compareProperties" param="file2">
+	<foreach target="compareBundles" param="file2">
 		<path>
 			<fileset dir="${basedir}/resources/lang">
 				<exclude name="Messages.properties" />
@@ -28,8 +32,23 @@
 	</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"/>
@@ -42,15 +61,6 @@
                     <matches pattern=",@{file1.property}," string=",${file2.list}," />
                 </not>
                 <then>
-                    <if>
-                        <not>
-                            <isset property="some_missing"/>
-                        </not>
-	                    <then>
-	                    	<echo message=" "/>
-	                    	<echo>**** Missing in ${file2}: ****</echo>
-	                    </then>
-                    </if>
                     <property name="some_missing" value="true"/>
                 	<antcall target="reportMissingProperty">
                 		<param name="textLabel" value="@{file1.property}"/>
@@ -60,6 +70,14 @@
             </if>
         </sequential>
     </for>
+    <if>
+        <not>
+            <isset property="some_missing"/>
+        </not>
+        <then>
+        	<echo>No labels missing :-)</echo>
+        </then>
+    </if>
 </target>
 
 <target name="reportMissingProperty" description="double dereference 'prefixedPropertyName' and report missing language property">