diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-28 21:02:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-28 22:28:56 +0100 |
| commit | 8c53af6fb868ab1aa31e76350ced9bc0e41d816a (patch) | |
| tree | 7a56706f256fa49bde1baf68c30d18e04c3b16a5 /scp2 | |
| parent | 855d4c5c122e833df1f3b1c88fa312f9f7bc6df1 (diff) | |
scp2: move python scriptprovider package to AutoInstall
Change-Id: I7e7f74ffbfd9edc4d8d4b3ca13d9a2f0d97dcbf4
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_python.mk | 5 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 7 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index c4f4fd0555b8..621629c0eb78 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -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,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,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 7074a8272861..92f52a898fb6 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -9,7 +9,10 @@ $(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) $(eval $(call gb_InstallModule_add_defs,scp2/python,\ diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 4ffee8f729fa..4076972d9222 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -20,13 +20,6 @@ #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 TXT_FILE_BODY; Dir = FILELIST_DIR; diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index d9cf73c816fd..bafd19033581 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -19,6 +19,7 @@ #include "macros.inc" #include "AutoInstall/python" +#include "AutoInstall/python_scriptprovider" #ifndef DISABLE_PYUNO @@ -75,7 +76,7 @@ Module gid_Module_Script_Provider_For_Python Description = "Script Provider For Python"; PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root_Brand; - Files = ( gid_File_scriptproviderforpython ); + Files = (auto_python_scriptprovider_ALL); Default = YES; Styles = (HIDDEN_ROOT); End |