diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 13:13:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 13:14:06 +0200 |
| commit | b2235e49d42cdd10603b33e2708c1449eadfbfbe (patch) | |
| tree | 6168d70e660fc51e2586b2469fe1892634ae05bf /languagetool | |
| parent | 5ce19ddcb6595c71980aecfa1e8c0827343159a4 (diff) | |
language tool: fix build
Change-Id: I6ba856d6817aa838a0519803eb5d8f582598c800
Diffstat (limited to 'languagetool')
| -rw-r--r-- | languagetool/ExternalProject_languagetool.mk | 6 | ||||
| -rw-r--r-- | languagetool/JLanguageTool-1.7.0.patch | 18 |
2 files changed, 5 insertions, 19 deletions
diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk index c32434d72e6c..20ebdf576fec 100644 --- a/languagetool/ExternalProject_languagetool.mk +++ b/languagetool/ExternalProject_languagetool.mk @@ -32,7 +32,11 @@ $(call gb_ExternalProject_get_state_target,languagetool,build) : -Dant.build.javac.target=$(JAVA_TARGET_VER) \ ) \ $(if $(debug),-Dbuild.debug="on") \ - -Dsolver.ooo.dir="$(OUTDIR_FOR_BUILD)/bin" dist && \ + -Dext.ooo.juh.lib="$(call gb_Jar_get_target,juh)" \ + -Dext.ooo.jurt.lib="$(call gb_Jar_get_target,jurt)" \ + -Dext.ooo.ridl.lib="$(call gb_Jar_get_target,ridl)" \ + -Dext.ooo.unoil.lib="$(call gb_Jar_get_target,unoil)" \ + dist && \ touch $@ # vim: set noet sw=4 ts=4: diff --git a/languagetool/JLanguageTool-1.7.0.patch b/languagetool/JLanguageTool-1.7.0.patch index d486d2b679d2..782b683af79e 100644 --- a/languagetool/JLanguageTool-1.7.0.patch +++ b/languagetool/JLanguageTool-1.7.0.patch @@ -1,21 +1,3 @@ -diff -Naur misc/build/JLanguageTool-1.7.0/build.properties misc/build/JLanguageTool-1.7.0_patched/build.properties ---- misc/build/JLanguageTool-1.7.0/build.properties 2012-06-25 08:22:35.000000000 +0200 -+++ misc/build/JLanguageTool-1.7.0_patched/build.properties 2012-06-25 09:24:21.253494500 +0200 -@@ -67,10 +67,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 - - converter.name = RuleConverter - build.meta-inf = ${build.dir}/META-INF diff -Naur misc/build/JLanguageTool-1.7.0/build.xml misc/build/JLanguageTool-1.7.0_patched/build.xml --- misc/build/JLanguageTool-1.7.0/build.xml 2012-06-25 08:22:35.000000000 +0200 +++ misc/build/JLanguageTool-1.7.0_patched/build.xml 2012-06-25 09:27:39.077442000 +0200 |