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 | |
| parent | 589d63451c52f7df2e5f5758432f0aa6d7a9b6c5 (diff) | |
scp2: move python3 to AutoInstall
Change-Id: I6ca298bb51fd707bcda7eabc607307701a0722ac
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_python.mk | 2 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 7 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 7871455d3533..8e872b0472bb 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -20,6 +20,7 @@ $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) +$(eval $(call gb_AutoInstall_add_module,python)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE)) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 3c79ed1541b3..a8137db694b3 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -9,6 +9,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,python)) + ifeq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DDISABLE_PYUNO \ 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, |