strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bsh can be external

Browse source
This commit is contained in:
David Tardon 2011-10-04 09:44:48 +02:00
parent 28a9c86ffa
commit 3bcf910cde
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
RepositoryExternal.mk
View file

@ -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:

5
scripting/Jar_ScriptProviderForBeanShell.mk
View file

@ -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))