diff options
| author | David Tardon <dtardon@redhat.com> | 2011-10-04 09:44:48 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-10-04 09:48:54 +0200 |
| commit | 3bcf910cde3fb26afe1ce116d97bd54b25c1e4ef (patch) | |
| tree | d53eab6706d640a11ec1245a3961b46d7637a44b | |
| parent | 28a9c86fface5d4674d9f47d92e6eee8cacf2087 (diff) | |
bsh can be external
| -rw-r--r-- | RepositoryExternal.mk | 14 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForBeanShell.mk | 5 |
2 files changed, 18 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1cc9c753123c..edaf6bfde87e 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 87e2cb933a50..e81f5b0c0827 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)) |