[Libreoffice-commits] core.git: languagetool/ExternalProject_languagetool.mk languagetool/JLanguageTool-1.7.0.patch solenv/gbuild

2013-10-25 Thread Michael Stahl 
 languagetool/ExternalProject_languagetool.mk |6 +-
 languagetool/JLanguageTool-1.7.0.patch   |   18 --
 solenv/gbuild/ExternalProject.mk |2 +-
 3 files changed, 6 insertions(+), 20 deletions(-)

New commits:
commit b2235e49d42cdd10603b33e2708c1449eadfbfbe
Author: Michael Stahl mst...@redhat.com
Date:   Fri Oct 25 13:13:45 2013 +0200

language tool: fix build

Change-Id: I6ba856d6817aa838a0519803eb5d8f582598c800

diff --git a/languagetool/ExternalProject_languagetool.mk 
b/languagetool/ExternalProject_languagetool.mk
index c32434d..20ebdf5 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 d486d2b..782b683 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.properties2012-06-25 
08:22:35.0 +0200
-+++ misc/build/JLanguageTool-1.7.0_patched/build.properties2012-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.0 
+0200
 +++ misc/build/JLanguageTool-1.7.0_patched/build.xml   2012-06-25 
09:27:39.077442000 +0200
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index 2dd034a..d6f2e60 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -189,7 +189,7 @@ endef
 # gb_ExternalProject_use_jars external jars
 define gb_ExternalProject_use_jars
 $(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
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: languagetool/ExternalProject_languagetool.mk

2013-05-21 Thread Stephan Bergmann 
 languagetool/ExternalProject_languagetool.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 90e2ad99a594c185ccc578c36121da83eaf8885f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 17:02:09 2013 +0200

Missing dependencies

cf. the various ext.ooo.*.lib in the tarball's build.xml

Change-Id: If58534c78b04768ab2d0524079d70bdd8ad16c00

diff --git a/languagetool/ExternalProject_languagetool.mk 
b/languagetool/ExternalProject_languagetool.mk
index fdee1ad..1035bb6 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -13,7 +13,11 @@ $(eval $(call 
gb_ExternalProject_register_targets,languagetool,\
build \
 ))
 
-$(call gb_ExternalProject_get_state_target,languagetool,build) : $(call 
gb_Jar_get_outdir_target,juh)
+$(call gb_ExternalProject_get_state_target,languagetool,build) : \
+$(call gb_Jar_get_outdir_target,juh) \
+$(call gb_Jar_get_outdir_target,jurt) \
+$(call gb_Jar_get_outdir_target,ridl) \
+$(call gb_Jar_get_outdir_target,unoil)
cd $(call gb_UnpackedTarball_get_dir,languagetool)  \
$(ICECREAM_RUN) $(ANT) \
-q \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits