diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-04-17 23:26:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-04-17 23:58:16 +0200 |
| commit | 8a8a24757b980fb46d10a9f21e32c5eae1d9fd27 (patch) | |
| tree | 311e4d1398408ebf0ff07c0b29e48746fe766e9b | |
| parent | 559d82d9bf69eeebb02aa857657f959241c1ed8c (diff) | |
scp2: move ScriptProviderForBeanShell jar to AutoInstall
Change-Id: Ib792eb8a4c6fa549bb34727838181c5924e7c150
| -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 540e913862cd..9eb2ff500d83 100644 --- a/Repository.mk +++ b/Repository.mk @@ -660,9 +660,14 @@ $(eval $(call gb_Helper_register_jars_for_install,OOO,ooo, \ xmerge \ )) +ifneq ($(ENABLE_SCRIPTING_BEANSHELL),) +$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_bsh, \ + ScriptProviderForBeanShell \ +)) +endif + $(eval $(call gb_Helper_register_jars,OOO, \ ConnectivityTools \ - ScriptProviderForBeanShell \ ScriptProviderForJavaScript \ XSLTFilter \ XSLTValidate \ diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 95b94c77a447..c596b6348322 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -213,8 +213,6 @@ End #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL -STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) - File gid_File_Rdb_Scriptproviderforbeanshell TXT_FILE_BODY; Name = "scriptproviderforbeanshell.rdb"; diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 523c21a5f9b6..d3b27b6ba457 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -250,7 +250,6 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_BS MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL); ParentID = gid_Module_Optional_Extensions; Files = (auto_extensions_bsh_ALL, - gid_File_Jar_Scriptproviderforbeanshell, gid_File_Rdb_Scriptproviderforbeanshell ); Minimal = NO; Default = YES; |