scp2: move python3 to AutoInstall

Change-Id: I6ca298bb51fd707bcda7eabc607307701a0722ac

RepositoryExternal.mk

@@ -2794,6 +2794,10 @@ endef
 
 else # !SYSTEM_PYTHON
 
+$(eval $(call gb_Helper_register_packages_for_install,python,\
+	python3 \
+))
+
 # depend on external project because on MACOSX the Package is disabled...
 define gb_LinkTarget__use_python_headers
 $(call gb_LinkTarget_use_external_project,$(1),python3)

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))

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 \

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;

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,