mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scp2: move python scriptprovider package to AutoInstall

Browse Source 
Change-Id: I7e7f74ffbfd9edc4d8d4b3ca13d9a2f0d97dcbf4
This commit is contained in:
Michael Stahl 2015-02-28 21:02:04 +01:00
parent 855d4c5c12
commit 8c53af6fb8
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Repository.mk
View File

@ -873,6 +873,9 @@ ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Helper_register_packages_for_install,python, \ $(eval $(call gb_Helper_register_packages_for_install,python, \
pyuno_pythonloader_ini \ pyuno_pythonloader_ini \
)) ))
$(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \
scriptproviderforpython \
))
endif endif
# External executables # External executables

1
scp2/AutoInstall.mk
View File

@ -35,6 +35,7 @@ $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCOND
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,python_scriptprovider,))
$(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))

5
scp2/InstallModule_python.mk
View File

@ -9,7 +9,10 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/python)) $(eval $(call gb_InstallModule_InstallModule,scp2/python))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,python)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\
python \
python_scriptprovider \
))
ifeq ($(DISABLE_PYTHON),TRUE) ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\ $(eval $(call gb_InstallModule_add_defs,scp2/python,\

7
scp2/source/python/file_python.scp
View File

@ -20,13 +20,6 @@
#ifndef DISABLE_PYUNO #ifndef DISABLE_PYUNO
File gid_File_scriptproviderforpython
TXT_FILE_BODY;
Dir = FILELIST_DIR;
Name = "scriptproviderforpython.filelist";
Styles = (FILELIST, PACKED);
End
File gid_File_pyuno_python_scripts File gid_File_pyuno_python_scripts
TXT_FILE_BODY; TXT_FILE_BODY;
Dir = FILELIST_DIR; Dir = FILELIST_DIR;

3
scp2/source/python/module_python.scp
View File

@ -19,6 +19,7 @@
#include "macros.inc" #include "macros.inc"
#include "AutoInstall/python" #include "AutoInstall/python"
#include "AutoInstall/python_scriptprovider"
#ifndef DISABLE_PYUNO #ifndef DISABLE_PYUNO
@ -75,7 +76,7 @@ Module gid_Module_Script_Provider_For_Python
Description = "Script Provider For Python"; Description = "Script Provider For Python";
PackageInfo = "packinfo_office.txt"; PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root_Brand; ParentID = gid_Module_Root_Brand;
Files = ( gid_File_scriptproviderforpython ); Files = (auto_python_scriptprovider_ALL);
Default = YES; Default = YES;
Styles = (HIDDEN_ROOT); Styles = (HIDDEN_ROOT);
End End