RepositoryExternal.mk | 14 ++++++++++++++
scripting/Jar_ScriptProviderForBeanShell.mk | 5 ++++-
2 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 3bcf910cde3fb26afe1ce116d97bd54b25c1e4ef
Author: David Tardon <dtar...@redhat.com>
Date: Tue Oct 4 09:44:48 2011 +0200
bsh can be external
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1cc9c75..edaf6bf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -847,5 +847,19 @@ endef
endif # SYSTEM_SAXON
+ifeq ($(SYSTEM_BSH),YES)
+
+define gb_JavaClassSet__use_bsh
+$(call gb_JavaClassSet_add_system_jar,$(1),$(BSH_JAR))
+endef
+
+else # !SYSTEM_BSH
+
+define gb_JavaClassSet__use_bsh
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/bsh.jar)
+endef
+
+endif # SYSTEM_BSH
+
# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk
b/scripting/Jar_ScriptProviderForBeanShell.mk
index 87e2cb9..e81f5b0 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -34,7 +34,10 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/unoil.jar \
$(OUTDIR)/bin/ScriptFramework.jar \
- $(OUTDIR)/bin/bsh.jar \
+))
+
+$(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
+ bsh \
))
$(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
