scp2: move bsh to AutoInstall

Change-Id: Ib030d8fc3bd7c3c38f8728c80414fde505b36537

5 files changed, 14 insertions, 7 deletions

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 8e872b0472bb..7b5b13ef6eb7 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_AutoInstall_AutoInstall))
 $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index 7250d12dd9af..8f36eb59c8b0 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -9,8 +9,9 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
+
 $(eval $(call gb_InstallModule_define_if_set,scp2/extensions,\
-	SYSTEM_BSH \
 	SYSTEM_RHINO \
 ))
 
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8375644b1272..bed8deb62930 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -251,6 +251,14 @@ End
         Styles   = (PACKED); \
     End
 
+#define LIBO_JAR_FILE(id,name) \
+    File id \
+        TXT_FILE_BODY; \
+        Name = name; \
+        Dir = gid_Dir_Classes; \
+        Styles = (PACKED); \
+    End
+
 #define URE_JAR_FILE(id,name) \
     File id \
         TXT_FILE_BODY; \
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;