diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-18 20:38:30 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:18:10 +0100 |
| commit | 8475eb98beb07d955a391e4c8f71846a24b38667 (patch) | |
| tree | abc510b69a21894b8b9768739377c0028565519c /scp2/source/extensions | |
| parent | 720ca8e1a9535bb14fcdb284b7739e98285df12f (diff) | |
scp2: move bsh to AutoInstall
Change-Id: Ib030d8fc3bd7c3c38f8728c80414fde505b36537
Diffstat (limited to 'scp2/source/extensions')
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 4 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 09966f796aa9..1ac77f2c731e 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -213,10 +213,6 @@ End #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL -#if !defined SYSTEM_BSH -STD_JAR_FILE( gid_File_Jar_Bsh, bsh ) -#endif - STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) File gid_File_Rdb_Scriptproviderforbeanshell diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index b088131f9ca4..ea7939ca527f 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -18,6 +18,8 @@ #include "macros.inc" +#include "AutoInstall/extensions_bsh" + Module gid_Module_Optional_Extensions MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS); ParentID = gid_Module_Optional; @@ -246,8 +248,7 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_BS PackageInfo = "packinfo_extensions.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL); ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Jar_Bsh, + Files = (auto_extensions_bsh_ALL, gid_File_Jar_Scriptproviderforbeanshell, gid_File_Rdb_Scriptproviderforbeanshell ); Minimal = NO; |