diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-03-18 18:24:15 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:18:10 +0100 |
commit | 720ca8e1a9535bb14fcdb284b7739e98285df12f (patch) | |
tree | cbb6d237260b815a641c362a1d84b04de11c4c1d /scp2/source/python | |
parent | 589d63451c52f7df2e5f5758432f0aa6d7a9b6c5 (diff) |
scp2: move python3 to AutoInstall
Change-Id: I6ca298bb51fd707bcda7eabc607307701a0722ac
Diffstat (limited to 'scp2/source/python')
-rw-r--r-- | scp2/source/python/file_python.scp | 7 | ||||
-rw-r--r-- | scp2/source/python/module_python.scp | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index fda0ba58d9d2..43a83163fbad 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -82,13 +82,6 @@ Directory gid_Dir_Py_PythonCore_Lib End #endif -File gid_File_Py_Python_Core - TXT_FILE_BODY; - Dir = FILELIST_DIR; - Name = "python3.filelist"; - Styles = (FILELIST,USE_INTERNAL_RIGHTS); -End - #ifdef WNT Directory gid_Dir_Py_PythonCore_Bin ParentID = gid_Dir_Py_PythonCore; diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index faa157d51cdc..26c16b14f9d9 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -18,6 +18,8 @@ #include "macros.inc" +#include "AutoInstall/python" + #ifndef DISABLE_PYUNO Module gid_Module_Pyuno @@ -36,7 +38,8 @@ Module gid_Module_Pyuno gid_Dir_Py_PythonCore, gid_Dir_Py_PythonCore_Bin, gid_Dir_Py_PythonCore_Lib); - Files = (gid_File_Pyuno, + Files = (auto_python_ALL, + gid_File_Pyuno, gid_File_Pyuno_Rdb, gid_File_Lib_Pyuno, gid_File_Lib_Pythonloader, |