[ooo-build-commit] .: languagetool/JLanguageTool-1.0.0.patch languagetool/makefile.mk languagetool/prj
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 08:28:32 PDT 2010
languagetool/JLanguageTool-1.0.0.patch | 137 ---------------------------------
languagetool/makefile.mk | 67 ----------------
languagetool/prj/build.lst | 3
languagetool/prj/d.lst | 1
4 files changed, 208 deletions(-)
New commits:
commit ff7279bcea6a84b78d0f2857afc65bdfdf74d292
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 17:27:58 2010 +0200
Moving languagetool out of the wront repository
diff --git a/languagetool/JLanguageTool-1.0.0.patch b/languagetool/JLanguageTool-1.0.0.patch
deleted file mode 100644
index 2b025c9..0000000
--- a/languagetool/JLanguageTool-1.0.0.patch
+++ /dev/null
@@ -1,137 +0,0 @@
---- 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 @@
- 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
-
--ext.ooo.juh.lib = ${ext.ooo.dir}/juh.jar
--ext.ooo.unoil.lib = ${ext.ooo.dir}/unoil.jar
--ext.ooo.ridl.lib = ${ext.ooo.dir}/ridl.jar
--ext.ooo.jurt.lib = ${ext.ooo.dir}/jurt.jar
-+ext.ooo.juh.lib = ${solver.ooo.dir}/juh.jar
-+ext.ooo.unoil.lib = ${solver.ooo.dir}/unoil.jar
-+ext.ooo.ridl.lib = ${solver.ooo.dir}/ridl.jar
-+ext.ooo.jurt.lib = ${solver.ooo.dir}/jurt.jar
-
- 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}" />
- <pathelement location="${ext.segment.lib}" />
- <!-- -->
-+ <pathelement location="${ext.junit.lib}"/>
-+ <!-- -->
- <pathelement location="${ext.ooo.juh.lib}" />
- <pathelement location="${ext.ooo.unoil.lib}" />
- <pathelement location="${ext.ooo.ridl.lib}" />
-@@ -367,11 +369,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/**" />
- </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/**" />
- </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}" />
-
-
- <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" />
-
- <!-- 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
-@@ -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);
- if (motherTongueStr != null) {
-+ // FIXME: hack to disable the functionality for JRE 1.5
-+ // javax.xml.bind.JAXBException is part of JRE 1.6
-+ boolean isJRE15 = false;
-+ try {
-+ ClassLoader cl = ClassLoader.getSystemClassLoader();
-+ cl.loadClass("javax.xml.bind.JAXBException");
-+ } catch (ClassNotFoundException e) {
-+ isJRE15 = true;
-+ }
-+ if (!isJRE15) {
- motherTongue = Language.getLanguageForShortName(motherTongueStr);
- }
-+ }
- 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
-@@ -24,6 +24,7 @@
- * @author Marcin Miłkowski
- */
- import java.io.File;
-+import java.lang.ClassLoader;
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Comparator;
-@@ -455,6 +456,14 @@
- * @return An array of Locales supported by LT.
- */
- public final Locale[] getLocales() {
-+ // FIXME: hack to disable the functionality for JRE 1.5
-+ // javax.xml.bind.JAXBException is part of JRE 1.6
-+ try {
-+ ClassLoader cl = ClassLoader.getSystemClassLoader();
-+ cl.loadClass("javax.xml.bind.JAXBException");
-+ } catch (ClassNotFoundException e) {
-+ return new Locale[0];
-+ }
- 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;
diff --git a/languagetool/makefile.mk b/languagetool/makefile.mk
deleted file mode 100644
index d96d702..0000000
--- a/languagetool/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.10 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=languagetool
-TARGET=languagetool
-
-.IF "$(SOLAR_JAVA)"!=""
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : antsettings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=JLanguageTool-1.0.0
-TARFILE_MD5=47e1edaa44269bc537ae8cabebb0f638
-TARFILE_ROOTDIR=JLanguageTool-1.0.0
-PATCH_FILES=JLanguageTool-1.0.0.patch
-
-.IF "$(JAVACISGCJ)"=="yes"
-JAVA_HOME=
-.EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin -Dbuild.compiler=gcj dist
-.ELSE
-BUILD_ACTION=$(ANT) -v -Dsolver.ooo.dir=$(SOLARVER)$/$(INPATH)$/bin -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) dist
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ELSE
-all:
- @echo java disabled
-.ENDIF
diff --git a/languagetool/prj/build.lst b/languagetool/prj/build.lst
deleted file mode 100644
index 98e25c3..0000000
--- a/languagetool/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-lt languagetool : javaunohelper jurt ridljar unoil NULL
-lt languagetool usr1 - all lt_mkout NULL
-lt languagatool nmake - all lt_languagetool NULL
diff --git a/languagetool/prj/d.lst b/languagetool/prj/d.lst
deleted file mode 100644
index b3c00b3..0000000
--- a/languagetool/prj/d.lst
+++ /dev/null
@@ -1 +0,0 @@
-..\%__SRC%\misc\build\JLanguageTool*\dist\LanguageTool.oxt %_DEST%\bin%_EXT%\
More information about the ooo-build-commit
mailing list