diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-02-28 21:10:20 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-02-28 22:28:56 +0100 |
commit | 62eb3bf472975e9af4d12e0e4fea5d9c419694b9 (patch) | |
tree | ace0a991b2aa4e2557bd84ab4aff3262c9dce261 | |
parent | 8c53af6fb868ab1aa31e76350ced9bc0e41d816a (diff) |
scp2: move python packages to AutoInstall
Change-Id: I1444e114e5cdbe794d79f40edebc32cb0229a4b5
-rw-r--r-- | Repository.mk | 3 | ||||
-rw-r--r-- | scp2/source/python/file_python.scp | 25 | ||||
-rw-r--r-- | scp2/source/python/module_python.scp | 2 |
3 files changed, 3 insertions, 27 deletions
diff --git a/Repository.mk b/Repository.mk index 5441a821da29..a15c1d32066a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -872,6 +872,9 @@ endif # GUIBASE=unx ifneq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_Helper_register_packages_for_install,python, \ pyuno_pythonloader_ini \ + pyuno_python_scripts \ + $(if $(SYSTEM_PYTHON),,$(if $(filter-out WNT,$(OS)),python_shell)) \ + scripting_ScriptsPython \ )) $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \ scriptproviderforpython \ diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 4076972d9222..10599cc6cd3e 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_pyuno_python_scripts - TXT_FILE_BODY; - Dir = FILELIST_DIR; - Name = "pyuno_python_scripts.filelist"; - Styles = (FILELIST, PACKED); -End - File gid_File_Pyuno_Rdb TXT_FILE_BODY; Dir = gid_Brand_Dir_Program_Services; @@ -36,15 +29,6 @@ End #ifndef SYSTEM_PYTHON -#if !defined WNT -File gid_File_Py_Bin_Python - BIN_FILE_BODY; - Name = "python_shell.filelist"; - Dir = FILELIST_DIR; - Styles = (FILELIST, PACKED); -End -#endif - #ifndef MACOSX Directory gid_Dir_Py_PythonCore ParentID = gid_Brand_Dir_Program; @@ -66,15 +50,6 @@ End #endif // SYSTEM_PYTHON -//Scripting Framework Python example scripts - -File gid_File_Scripts_Python - Dir = FILELIST_DIR; - TXT_FILE_BODY; - Styles = (FILELIST); - Name = "scripting_ScriptsPython.filelist"; -End - // Scripting Framework Python configuration settings File gid_File_Share_Registry_Pyuno_Xcd diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index bafd19033581..c4a29155e2aa 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -46,8 +46,6 @@ Module gid_Module_Pyuno gid_File_Py_Python_Bin, gid_File_Lib_Python_So, gid_File_Lib_Python3_So, - gid_File_Scripts_Python, - gid_File_pyuno_python_scripts, gid_File_Share_Registry_Pyuno_Xcd); Unixlinks = (gid_Unixlink_Python_Headers, gid_Unixlink_Python_LibreOfficePython, |