Update JLanguageTool to version 1.4.0

5215b409 · Andras Timar · dd854e50 · 5215b409 · 5215b409 · 5215b409
Kaydet (Commit) 5215b409 authored Agu 26, 2011 tarafından Andras Timar
Hide whitespace changes
Inline Side-by-side

Showing with 47 additions and 67 deletions

JLanguageTool-1.4.0.patch languagetool/JLanguageTool-1.4.0.patch +42 -62

makefile.mk languagetool/makefile.mk +4 -4

ooo.lst.in ooo.lst.in +1 -1

No files found.
--- a/languagetool/JLanguageTool-1.0.0.patch
+++ b/languagetool/JLanguageTool-1.0.0.patch
--- misc/JLanguageTool-1.0.0/build.properties	2009-11-01 17:02:22.000000000 +0100
-+++ misc/build/JLanguageTool-1.0.0/build.properties	2010-03-10 15:33:21.000000000 +0100
-@@ -54,10 +54,10 @@
+diff -Naur misc/JLanguageTool-1.4.0//build.properties misc/build/JLanguageTool-1.4.0/build.properties
+--- misc/JLanguageTool-1.4.0//build.properties	2011-06-26 20:29:43.000000000 +0200
+++ misc/build/JLanguageTool-1.4.0/build.properties	2011-08-25 18:22:31.305870800 +0200
+@@ -50,10 +50,10 @@
 ext.log4j.lib = ${ext.dir}/build/cobertura/log4j-1.2.9.jar
 ext.jakarta-oro.lib = ${ext.dir}/build/cobertura/jakarta-oro-2.0.8.jar
 
@@ -15,10 +16,11 @@
 
 build.meta-inf = ${build.dir}/META-INF
 final.name = LanguageTool
--- misc/JLanguageTool-1.0.0/build.xml	2009-10-26 14:28:30.000000000 +0100
-+++ misc/build/JLanguageTool-1.0.0/build.xml	2010-03-10 15:33:21.000000000 +0100
-@@ -20,6 +20,8 @@
- 		<pathelement location="${ext.logging.lib}" />		
+diff -Naur misc/JLanguageTool-1.4.0//build.xml misc/build/JLanguageTool-1.4.0/build.xml
+--- misc/JLanguageTool-1.4.0//build.xml	2011-06-26 20:29:43.000000000 +0200
+++ misc/build/JLanguageTool-1.4.0/build.xml	2011-08-25 18:26:51.816771100 +0200
+@@ -24,6 +24,8 @@
+         <pathelement location="${ext.jakarta-regex.lib}" />
 		<pathelement location="${ext.segment.lib}" />
 		<!-- -->
 +		<pathelement location="${ext.junit.lib}"/>
@@ -26,61 +28,50 @@
 		<pathelement location="${ext.ooo.juh.lib}" />
 		<pathelement location="${ext.ooo.unoil.lib}" />
 		<pathelement location="${ext.ooo.ridl.lib}" />
-@@ -367,11 +369,11 @@
+@@ -390,11 +392,11 @@
 <!-- ================================================================== -->
 
 <target name="dist" depends="ooo-internal" description="Builds one ZIP for both OpenOffice.org and stand-alone use">
-<zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,jdic.jar,printlocales.jar,linux/**,windows/**,sunos/**,mac/**" />
-+<zip compress="yes" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,jdic.jar,printlocales.jar,linux/**,windows/**,sunos/**,mac/**" />
+-<zip compress="yes" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" />
+<zip compress="yes" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" />
 </target>
 
 <target name="fast" depends="ooo-internal" description="like dist, but without ZIP compression (for development only)">
-<zip compress="no" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,jdic.jar,printlocales.jar,linux/**,windows/**,sunos/**,mac/**" />
-+<zip compress="no" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,jdic.jar,printlocales.jar,linux/**,windows/**,sunos/**,mac/**" />
+-<zip compress="no" destfile="${dist.dir}/LanguageTool-${version}.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" />
+<zip compress="no" destfile="${dist.dir}/LanguageTool.oxt" basedir="${dist.dir}" includes="**" excludes="deploy.sh,undeploy.sh,turn.sh,printlocales.jar" />
 </target>
 
- <target name="ooo-internal" depends="clean,init,build,ooo-build">
-@@ -402,11 +404,6 @@
- <copy file="${ext.segment.lib}" todir="${dist.dir}" />
- <copy file="${ext.logging.lib}" todir="${dist.dir}" />
- <copy file="${ext.junit.lib}" todir="${dist.dir}" />
-<!-- JAXB jars for Java 1.5 -->	
-<copy file="${ext.jaxb-api.lib}" todir="${dist.dir}" />
-<copy file="${ext.jaxb-impl.lib}" todir="${dist.dir}" />
-<copy file="${ext.jsr.lib}" todir="${dist.dir}" />
-<copy file="${ext.activation.lib}" todir="${dist.dir}" />
+ <target name="common" depends="clean,init,build,ooo-build">
+@@ -502,7 +504,6 @@
+ 	<copy file="${resource.dir}/sv/swedish.dict" todir="${dist.dir}/resource/sv" />
+ 	<copy file="${resource.dir}/sv/compounds.txt" todir="${dist.dir}/resource/sv" />
 
+-	<copy file="${resource.dir}/uk/ukrainian.dict" todir="${dist.dir}/resource/uk" />
 
- <copy todir="${dist.dir}/linux">
-@@ -472,7 +472,6 @@
- <copy file="${resource.dir}/sv/swedish.info" todir="${dist.dir}/resource/sv" />
- <copy file="${resource.dir}/sv/swedish.dict" todir="${dist.dir}/resource/sv" />
- <copy file="${resource.dir}/sv/compounds.txt" todir="${dist.dir}/resource/sv" />
-<copy file="${resource.dir}/uk/ukrainian.dict" todir="${dist.dir}/resource/uk" />
- <copy file="${resource.dir}/ru/russian.dict" todir="${dist.dir}/resource/ru" />
- <copy file="${resource.dir}/ru/russian.info" todir="${dist.dir}/resource/ru" />
- <copy file="${resource.dir}/ru/russian_tags.txt" todir="${dist.dir}/resource/ru" />
-@@ -494,7 +493,6 @@
- <copy file="${resource.dir}/sk/slovak_synth.dict" todir="${dist.dir}/resource/sk" />
- <copy file="${resource.dir}/sk/slovak_synth.info" todir="${dist.dir}/resource/sk" />
- <copy file="${resource.dir}/sk/slovak_tags.txt" todir="${dist.dir}/resource/sk" />
-<copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" />
+ 	<copy file="${resource.dir}/ru/russian.dict" todir="${dist.dir}/resource/ru" />
+ 	<copy file="${resource.dir}/ru/russian.info" todir="${dist.dir}/resource/ru" />
+@@ -544,7 +545,6 @@
+ 	<copy file="${resource.dir}/ca/catalan.info" todir="${dist.dir}/resource/ca" />
+ 	<copy file="${resource.dir}/ca/README" todir="${dist.dir}/resource/ca" />
 
- <!-- prepare properties file automatically -->
- <javac encoding="${encoding}" srcdir="${src.dir}/dev" includes="de/danielnaber/languagetool/dev/PrintLocales.java" destdir="${build.classes}" target="${target}" debug="${debug}">
--- misc/JLanguageTool-1.0.0/src/java/de/danielnaber/languagetool/gui/Configuration.java	2009-01-01 23:39:30.000000000 +0100
-+++ misc/build/JLanguageTool-1.0.0/src/java/de/danielnaber/languagetool/gui/Configuration.java	2010-03-10 15:33:21.000000000 +0100
+-	<copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" />
+ 	<copy todir="${dist.dir}/rules">
+ 		<fileset dir="src/rules" excludes="CVS" />
+ 	</copy>
+diff -Naur misc/JLanguageTool-1.4.0//src/java/de/danielnaber/languagetool/gui/Configuration.java misc/build/JLanguageTool-1.4.0/src/java/de/danielnaber/languagetool/gui/Configuration.java
+--- misc/JLanguageTool-1.4.0//src/java/de/danielnaber/languagetool/gui/Configuration.java	2011-06-26 20:29:43.000000000 +0200
+++ misc/build/JLanguageTool-1.4.0/src/java/de/danielnaber/languagetool/gui/Configuration.java	2011-08-25 18:30:03.856755200 +0200
 @@ -23,6 +23,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 +import java.lang.ClassLoader;
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.Properties;
-@@ -154,8 +155,19 @@
-       final String motherTongueStr = (String) props
-           .get(MOTHER_TONGUE_CONFIG_KEY);
+ import java.util.*;
+ 
+ import de.danielnaber.languagetool.Language;
+@@ -132,8 +133,19 @@
+       
+       final String motherTongueStr = (String) props.get(MOTHER_TONGUE_CONFIG_KEY);
       if (motherTongueStr != null) {
 +        // FIXME: hack to disable the functionality for JRE 1.5
 +        // javax.xml.bind.JAXBException is part of JRE 1.6
@@ -98,8 +89,9 @@
       final String runServerString = (String) props.get(SERVER_RUN_CONFIG_KEY);
       if (runServerString != null) {
         runServer = runServerString.equals("true");
--- misc/JLanguageTool-1.0.0/src/java/de/danielnaber/languagetool/openoffice/Main.java	2009-10-24 16:52:03.000000000 +0200
-+++ misc/build/JLanguageTool-1.0.0/src/java/de/danielnaber/languagetool/openoffice/Main.java	2010-03-10 15:33:21.000000000 +0100
+diff -Naur misc/JLanguageTool-1.4.0//src/java/de/danielnaber/languagetool/openoffice/Main.java misc/build/JLanguageTool-1.4.0/src/java/de/danielnaber/languagetool/openoffice/Main.java
+--- misc/JLanguageTool-1.4.0//src/java/de/danielnaber/languagetool/openoffice/Main.java	2011-06-26 20:29:43.000000000 +0200
+++ misc/build/JLanguageTool-1.4.0/src/java/de/danielnaber/languagetool/openoffice/Main.java	2011-08-25 18:32:21.593633300 +0200
 @@ -24,6 +24,7 @@
  * @author Marcin Miłkowski
  */
@@ -108,9 +100,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
-@@ -455,6 +456,14 @@
-    * @return An array of Locales supported by LT.
+@@ -454,6 +455,14 @@
    */
+   @Override
   public final Locale[] getLocales() {
 +    // FIXME: hack to disable the functionality for JRE 1.5
 +    // javax.xml.bind.JAXBException is part of JRE 1.6
@@ -123,15 +115,3 @@
     try {
       int dims = 0;
       for (final Language element : Language.LANGUAGES) {
-@@ -609,9 +618,9 @@
-     if (version != null
-         && (version.startsWith("1.0") || version.startsWith("1.1")
-             || version.startsWith("1.2") || version.startsWith("1.3") || version
-            .startsWith("1.4"))) {
-+            .startsWith("1.4") || version.startsWith("1.5"))) {
-       final DialogThread dt = new DialogThread(
-          "Error: LanguageTool requires Java 1.5 or later. Current version: "
-+          "Error: LanguageTool requires Java 1.6 or later. Current version: "
-               + version);
-       dt.start();
-       return false;
--- a/languagetool/makefile.mk
+++ b/languagetool/makefile.mk
@@ -38,10 +38,10 @@ TARGET=languagetool

 # --- Files --------------------------------------------------------

-TARFILE_NAME=JLanguageTool-1.0.0
-TARFILE_MD5=47e1edaa44269bc537ae8cabebb0f638
-TARFILE_ROOTDIR=JLanguageTool-1.0.0
-PATCH_FILES=JLanguageTool-1.0.0.patch
+TARFILE_NAME=JLanguageTool-1.4.0
+TARFILE_MD5=b99fb620b1324b4ce79ee6998b507146
+TARFILE_ROOTDIR=JLanguageTool-1.4.0
+PATCH_FILES=JLanguageTool-1.4.0.patch

 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=

--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -76,7 +76,7 @@ a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
 c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz
 314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2
+b99fb620b1324b4ce79ee6998b507146-JLanguageTool-1.4.0.tar.bz2
 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz