Revision: 7242
http://languagetool.svn.sourceforge.net/languagetool/?rev=7242&view=rev
Author: milek_pl
Date: 2012-06-05 11:33:56 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
make the fail message more informative
Modified Paths:
--------------
trunk/JLanguageTool/build.xml
trunk/JLanguageTool/src/dev/tools/VersionInfo.js
Modified: trunk/JLanguageTool/build.xml
===================================================================
--- trunk/JLanguageTool/build.xml 2012-06-05 11:25:00 UTC (rev 7241)
+++ trunk/JLanguageTool/build.xml 2012-06-05 11:33:56 UTC (rev 7242)
@@ -149,11 +149,13 @@
<target name="test-hunspell-libs">
<echo>Testing versions of hunspell libraries...</echo>
- <exec failonerror="false" resultproperty="return.code"
os="Windows XP Windows Vista Windows 7" dir="${src.java.dev.dir}/tools"
executable="cscript">
+ <exec failonerror="false" resultproperty="return.code"
os="Windows XP Windows Vista Windows 7" dir="${src.java.dev.dir}/tools"
+ outputproperty="return.message"
+ executable="cscript">
<arg value="/nologo"/>
<arg value="VersionInfo.js"/>
</exec>
- <fail message="The version numbers of two Windows DLLs are
different!">
+ <fail message="${return.message}">
<condition>
<equals arg1="-1" arg2="${return.code}"/>
</condition>
Modified: trunk/JLanguageTool/src/dev/tools/VersionInfo.js
===================================================================
--- trunk/JLanguageTool/src/dev/tools/VersionInfo.js 2012-06-05 11:25:00 UTC
(rev 7241)
+++ trunk/JLanguageTool/src/dev/tools/VersionInfo.js 2012-06-05 11:33:56 UTC
(rev 7242)
@@ -28,8 +28,10 @@
var version1 =
fso.GetFileVersion("../../../libs/native-lib/hunspell-win-x86-64.dll");
var version2 =
fso.GetFileVersion("../../../libs/native-lib/hunspell-win-x86-32.dll");
+//TODO: check for minimal version number (1.3.1.0?)
+
if (version1 != version2) {
- WScript.Echo("Error: version mismatch: " + version1 + " != " +
version2);
+ WScript.Echo("Error: Hunspell Windows DLLs have different version
numbers! \r\n 64-bit library has number: " + version1 + " 32-bit library has
number: " + version2);
WScript.Quit(-1);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
