diff options
| -rw-r--r-- | Repository.mk | 8 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_python.mk | 1 | ||||
| -rw-r--r-- | scp2/source/python/file_python_librelogo.scp | 14 | ||||
| -rw-r--r-- | scp2/source/python/module_python_librelogo.scp | 5 |
5 files changed, 12 insertions, 17 deletions
diff --git a/Repository.mk b/Repository.mk index a15c1d32066a..02bf16e4995a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -876,10 +876,16 @@ $(eval $(call gb_Helper_register_packages_for_install,python, \ $(if $(SYSTEM_PYTHON),,$(if $(filter-out WNT,$(OS)),python_shell)) \ scripting_ScriptsPython \ )) + $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \ scriptproviderforpython \ )) -endif + +$(eval $(call gb_Helper_register_packages_for_install,python_librelogo, \ + librelogo \ + librelogo_properties \ +)) +endif # DISABLE_PYTHON # External executables $(eval $(call gb_ExternalExecutable_register_executables,\ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 621629c0eb78..e271be86bf6d 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -36,6 +36,7 @@ $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_J $(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_scriptprovider,)) +$(eval $(call gb_AutoInstall_add_module,python_librelogo,)) $(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,quickstart,,LIBO_EXECUTABLE)) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 92f52a898fb6..965781cc771e 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\ python \ python_scriptprovider \ + python_librelogo \ )) ifeq ($(DISABLE_PYTHON),TRUE) diff --git a/scp2/source/python/file_python_librelogo.scp b/scp2/source/python/file_python_librelogo.scp index d78bdd2f4573..67f789f80045 100644 --- a/scp2/source/python/file_python_librelogo.scp +++ b/scp2/source/python/file_python_librelogo.scp @@ -10,20 +10,6 @@ #ifndef AIX #ifndef DISABLE_PYUNO -File gid_File_LibreLogo - TXT_FILE_BODY; - Styles = (FILELIST); - Dir = FILELIST_DIR; - Name = "librelogo.filelist"; -End - -File gid_File_LibreLogoProperties - TXT_FILE_BODY; - Styles = (FILELIST); - Dir = FILELIST_DIR; - Name = "librelogo_properties.filelist"; -End - File gid_File_Share_Registry_LibreLogo_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp index de72516716f0..1102b8750252 100644 --- a/scp2/source/python/module_python_librelogo.scp +++ b/scp2/source/python/module_python_librelogo.scp @@ -8,6 +8,8 @@ #include "macros.inc" +#include "AutoInstall/python_librelogo" + #ifndef AIX #ifndef DISABLE_PYUNO Module gid_Module_Optional_Pyuno_LibreLogo @@ -15,8 +17,7 @@ Module gid_Module_Optional_Pyuno_LibreLogo MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_LIBRELOGO ); ParentID = gid_Module_Optional; Sortkey = "810"; - Files = (gid_File_LibreLogo, - gid_File_LibreLogoProperties, + Files = (auto_python_librelogo_ALL, gid_File_Share_Registry_LibreLogo_Xcd); Default = YES; Styles = ( ); |