summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-06-17 15:26:52 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-09 22:08:59 +0200
commit031fd222ac94ab30c8e17f96263934bd5e148dd7 (patch)
tree26f78d989b63cc64588852c30aef367098df3e06 /scp2
parent4cb5f23b232ac22369d700f8bfae713e6893449c (diff)
pyuno: install python scripts using filelists
Change-Id: Ic7515acd14916cc36b59749059ed623cda906c23
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/python/file_python.scp11
-rw-r--r--scp2/source/python/module_python.scp4
2 files changed, 8 insertions, 7 deletions
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index e53763f89795..fee4cdf4ecb8 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -27,6 +27,13 @@ File gid_File_scriptproviderforpython
Styles = (FILELIST, PACKED);
End
+File gid_File_pyuno_python_scripts
+ TXT_FILE_BODY;
+ Dir = FILELIST_DIR;
+ Name = "pyuno_python_scripts.filelist";
+ Styles = (FILELIST, PACKED);
+End
+
File gid_File_Lib_Pyuno
PACKED_LIB_FILE_BODY;
#ifdef UNX
@@ -49,10 +56,6 @@ File gid_File_Pyuno_Rdb
Styles = (PACKED);
End
-STD_PY_FILE(gid_File_Py_Unohelper, "pyuno/unohelper.py")
-STD_PY_FILE(gid_File_Py_Uno, "pyuno/uno.py")
-STD_PY_FILE(gid_File_Py_Pythonloader, "pyuno/pythonloader.py")
-
#ifndef SYSTEM_PYTHON
File gid_File_Py_Bin_Python
BIN_FILE_BODY;
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 985dc318d1c3..6be3239e63ac 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -39,14 +39,12 @@ Module gid_Module_Pyuno
gid_File_Lib_Pyuno,
gid_File_Lib_Pythonloader,
gid_File_Py_Bin_Python,
- gid_File_Py_Unohelper,
- gid_File_Py_Uno,
- gid_File_Py_Pythonloader,
gid_File_Py_Python_Core,
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,