git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
77d3078
)
JAL-1424 tidied output
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Tue, 22 Sep 2015 09:38:57 +0000
(10:38 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Tue, 22 Sep 2015 09:38:57 +0000
(10:38 +0100)
utils/i18nAnt.xml
patch
|
blob
|
history
diff --git
a/utils/i18nAnt.xml
b/utils/i18nAnt.xml
index
eaabc47
..
47c404e
100755
(executable)
--- a/
utils/i18nAnt.xml
+++ b/
utils/i18nAnt.xml
@@
-19,6
+19,7
@@
var logger = project.getBuildListeners( ).firstElement( );
logger.setMessageOutputLevel( 1 );
</script>
var logger = project.getBuildListeners( ).firstElement( );
logger.setMessageOutputLevel( 1 );
</script>
+ <echo message="Missing message labels compared to Messages.properties"/>
<foreach target="compareProperties" param="file2">
<path>
<fileset dir="${basedir}/resources/lang">
<foreach target="compareProperties" param="file2">
<path>
<fileset dir="${basedir}/resources/lang">
@@
-35,6
+36,8
@@
<propertyselector property="file1.list" delimiter="," match="prefixfile1\.(.+)" select="\1"/>
<propertyselector property="file2.list" delimiter="," match="prefixfile2\.(.+)" select="\1"/>
<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>
<for list="${file1.list}" param="file1.property">
<sequential>
<if>
@@
-42,15
+45,6
@@
<matches pattern=",@{file1.property}," string=",${file2.list}," />
</not>
<then>
<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}"/>
<property name="some_missing" value="true"/>
<antcall target="reportMissingProperty">
<param name="textLabel" value="@{file1.property}"/>
@@
-60,6
+54,14
@@
</if>
</sequential>
</for>
</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">
</target>
<target name="reportMissingProperty" description="double dereference 'prefixedPropertyName' and report missing language property">