Kaydet (Commit) b2235e49 authored tarafından Michael Stahl's avatar Michael Stahl

language tool: fix build

Change-Id: I6ba856d6817aa838a0519803eb5d8f582598c800
üst 5ce19ddc
...@@ -32,7 +32,11 @@ $(call gb_ExternalProject_get_state_target,languagetool,build) : ...@@ -32,7 +32,11 @@ $(call gb_ExternalProject_get_state_target,languagetool,build) :
-Dant.build.javac.target=$(JAVA_TARGET_VER) \ -Dant.build.javac.target=$(JAVA_TARGET_VER) \
) \ ) \
$(if $(debug),-Dbuild.debug="on") \ $(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 $@ touch $@
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
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 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/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 +++ misc/build/JLanguageTool-1.7.0_patched/build.xml 2012-06-25 09:27:39.077442000 +0200
......
...@@ -189,7 +189,7 @@ endef ...@@ -189,7 +189,7 @@ endef
# gb_ExternalProject_use_jars external jars # gb_ExternalProject_use_jars external jars
define gb_ExternalProject_use_jars define gb_ExternalProject_use_jars
$(call gb_ExternalProject_get_preparation_target,$(1)) : \ $(call gb_ExternalProject_get_preparation_target,$(1)) : \
$(foreach jar,$(2),$(call gb_Jar_get_target,$(lib))) $(foreach jar,$(2),$(call gb_Jar_get_target,$(jar)))
endef endef
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment