From 32af02b32f1ab7f2683749e6c949470847175da0 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 6 May 2012 12:49:33 +0200 Subject: Allow usage of system rhino wrt fdo#42977 It is done the same way the beanshell is handled. Currently it can't be enabled by default as internal version has patched-in debug interface. We can choose two paths, rewrite the code to the new rhino debug interface or just strip the current one out. Change-Id: I48af18c635816db8269f13a649b62e9c454ee1e6 --- scripting/Jar_ScriptProviderForBeanShell.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'scripting/Jar_ScriptProviderForBeanShell.mk') diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index 7ef9af6c87f5..dc6f4dc7f931 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/scripting/Jar_ScriptProviderForBeanShell.mk @@ -42,13 +42,10 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\ $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF)) -ifeq ($(SYSTEM_BSH),YES) $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ - ScriptFramework.jar $(call gb_Helper_make_url,$(BSH_JAR)))) -else -$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \ - ScriptFramework.jar bsh.jar)) -endif + ScriptFramework.jar \ + $(if $(filter-out YES,$(SYSTEM_BSH)),bsh.jar) \ +)) $(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO)) -- cgit v1.2.3