summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorTomas Chvatal <tchvatal@suse.cz>2012-05-06 12:49:33 +0200
committerTomas Chvatal <tchvatal@suse.cz>2012-05-06 12:52:55 +0200
commit32af02b32f1ab7f2683749e6c949470847175da0 (patch)
treeba407c1c7de6d9807f91d5786007498a64c2e388 /RepositoryExternal.mk
parentb3d63df541ff6b2bf9c77699c8c076ebcde2d6cf (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 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk14
1 files changed, 14 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 09ea15cc90f4..bb5b16fc7ada 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1338,4 +1338,18 @@ endef
endif # SYSTEM_BSH
+ifeq ($(SYSTEM_RHINO),YES)
+
+define gb_JavaClassSet__use_rhino
+$(call gb_JavaClassSet_use_system_jar,$(1),$(RHINO_JAR))
+endef
+
+else # !SYSTEM_RHINO
+
+define gb_JavaClassSet__use_rhino
+$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/js.jar)
+endef
+
+endif # SYSTEM_RHINO
+
# vim: set noet sw=4 ts=4: