diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2012-05-06 12:49:33 +0200 |
|---|---|---|
| committer | Tomas Chvatal <tchvatal@suse.cz> | 2012-05-06 12:52:55 +0200 |
| commit | 32af02b32f1ab7f2683749e6c949470847175da0 (patch) | |
| tree | ba407c1c7de6d9807f91d5786007498a64c2e388 /scripting | |
| parent | b3d63df541ff6b2bf9c77699c8c076ebcde2d6cf (diff) | |
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
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/Jar_ScriptProviderForBeanShell.mk | 9 | ||||
| -rw-r--r-- | scripting/Jar_ScriptProviderForJavaScript.mk | 9 |
2 files changed, 10 insertions, 8 deletions
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)) diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index 99ee7c31c059..16c2cf4eb458 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/scripting/Jar_ScriptProviderForJavaScript.mk @@ -34,13 +34,18 @@ $(eval $(call gb_Jar_use_jars,ScriptProviderForJavaScript,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/ScriptFramework.jar \ - $(OUTDIR)/bin/js.jar \ +)) + +$(eval $(call gb_Jar_use_externals,ScriptProviderForJavaScript,\ + rhino \ )) $(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF)) $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \ - ScriptFramework.jar js.jar)) + ScriptFramework.jar \ + $(if $(filter-out YES,$(SYSTEM_RHINO)),js.jar) \ +)) $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO)) |