strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scp2: move rhino to AutoInstall

Browse source 
Change-Id: I5282632315dab9002784da22e24544798f63bc47
This commit is contained in:
Michael Stahl 2014-03-18 20:50:02 +01:00
parent 376d1b594a
commit 6474d1c13b
5 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RepositoryExternal.mk
View file

@ -3131,7 +3131,7 @@ endef
else # !SYSTEM_RHINO
$(eval $(call gb_Helper_register_jars,OOO,\
$(eval $(call gb_Helper_register_jars_for_install,OOO,extensions_rhino, \
js \
))

1
scp2/AutoInstall.mk
View file

@ -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))

5
scp2/InstallModule_extensions.mk
View file

@ -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),\

2
scp2/source/extensions/file_extensions.scp
View file

@ -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

4
scp2/source/extensions/module_extensions.scp
View file

@ -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;