wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

Allow usage of system rhino wrt fdo#42977

Browse Source 
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
This commit is contained in:
Tomas Chvatal
2012-05-06 12:49:33 +02:00
parent b3d63df541
commit 32af02b32f
6 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripting/Jar_ScriptProviderForJavaScript.mk
View File

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