Kaydet (Commit) 62eb3bf4 authored tarafından Michael Stahl's avatar Michael Stahl

scp2: move python packages to AutoInstall

Change-Id: I1444e114e5cdbe794d79f40edebc32cb0229a4b5
üst 8c53af6f
......@@ -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 \
......
......@@ -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
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment