diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-04-17 23:28:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-04-17 23:58:16 +0200 |
| commit | 4a3e8aaa3199a056975bfe2f96748d742d3313b0 (patch) | |
| tree | a59f3b7fd7fef63b8dd6576d9ffcba6dcc29c4ec | |
| parent | 8a8a24757b980fb46d10a9f21e32c5eae1d9fd27 (diff) | |
scp2: move ScriptProviderForJavaScript jar to AutoInstall
Change-Id: Ifbfc26c2ec8ade109c8fe7dfce70ef18d68881e2
| -rw-r--r-- | Repository.mk | 7 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 2 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 9eb2ff500d83..adce4a20f7a4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -666,9 +666,14 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \ )) endif +ifneq ($(ENABLE_SCRIPTING_JAVASCRIPT),) +$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \ + ScriptProviderForJavaScript \ +)) +endif + $(eval $(call gb_Helper_register_jars,OOO, \ ConnectivityTools \ - ScriptProviderForJavaScript \ XSLTFilter \ XSLTValidate \ agenda \ diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index c596b6348322..507128fa7b1a 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -226,8 +226,6 @@ End #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT -STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) - File gid_File_Rdb_Scriptproviderforjavascript TXT_FILE_BODY; Name = "scriptproviderforjavascript.rdb"; diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index d3b27b6ba457..6da685c9b751 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -267,7 +267,6 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_JS MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT); ParentID = gid_Module_Optional_Extensions; Files = (auto_extensions_rhino_ALL, - gid_File_Jar_Scriptproviderforjavascript, gid_File_Rdb_Scriptproviderforjavascript ); Minimal = NO; Default = YES; |