diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-18 20:50:02 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:18:11 +0100 |
| commit | 6474d1c13b36a7b8def221e5de27de11b15dd9d8 (patch) | |
| tree | 43dea6285e861ff0da78c6c7eb63d56e44e51033 /scp2 | |
| parent | 376d1b594a3df8c04a2cf879561dfe0bd5dbd8a5 (diff) | |
scp2: move rhino to AutoInstall
Change-Id: I5282632315dab9002784da22e24544798f63bc47
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_extensions.mk | 5 | ||||
| -rw-r--r-- | scp2/source/extensions/file_extensions.scp | 2 | ||||
| -rw-r--r-- | scp2/source/extensions/module_extensions.scp | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 7edab00a5b59..e963336c5509 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -13,6 +13,7 @@ $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYT $(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,extensions_rhino,,,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 8f36eb59c8b0..3b1b43e016b3 100644 --- a/scp2/InstallModule_extensions.mk +++ b/scp2/InstallModule_extensions.mk @@ -10,10 +10,7 @@ $(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_RHINO \ -)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_rhino)) $(eval $(call gb_InstallModule_add_defs,scp2/extensions,\ $(if $(SYSTEM_BSH),\ diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 1ac77f2c731e..95b94c77a447 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -228,8 +228,6 @@ End #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT -STD_JAR_FILE( gid_File_Jar_Js, js ) - STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) File gid_File_Rdb_Scriptproviderforjavascript diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index ea7939ca527f..523c21a5f9b6 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -19,6 +19,7 @@ #include "macros.inc" #include "AutoInstall/extensions_bsh" +#include "AutoInstall/extensions_rhino" Module gid_Module_Optional_Extensions MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS); @@ -266,8 +267,7 @@ Module gid_Module_Optional_Extensions_Script_Provider_For_JS PackageInfo = "packinfo_extensions.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT); ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Jar_Js, + Files = (auto_extensions_rhino_ALL, gid_File_Jar_Scriptproviderforjavascript, gid_File_Rdb_Scriptproviderforjavascript ); Minimal = NO; |