scp2: move python libraries to AutoInstall

Change-Id: Ib89daf3e608fd995845062eae2a7a33149964844

Repository.mk

@@ -428,6 +428,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,pdfimport, \
 	pdfimport \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,python, \
+	pythonloader \
+))
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,python, \
+	pyuno \
+	$(if $(filter-out WNT,$(OS)),pyuno_wrapper) \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,reportbuilder, \
 	rpt \
 	rptui \
@@ -584,8 +593,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	) \
 ))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	pyuno \
-	pyuno_wrapper \
 	xsec_xmlsec \
 	$(if $(filter $(OS),ANDROID), \
 		lo-bootstrap \
@@ -640,10 +647,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,RTVERLIBS,ure, \
 	salhelper \
 ))
 
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-	pythonloader \
-))
-
 $(eval $(call gb_Helper_register_libraries_for_install,UNOVERLIBS,ure, \
 	cppu \
 	sal \

scp2/AutoInstall.mk

@@ -23,7 +23,7 @@ $(eval $(call gb_AutoInstall_add_module,ogltrans,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,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
-$(eval $(call gb_AutoInstall_add_module,python))
+$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE))

scp2/source/python/file_python.scp

@@ -34,21 +34,6 @@ File gid_File_pyuno_python_scripts
     Styles = (FILELIST, PACKED);
 End
 
-File gid_File_Lib_Pyuno
-    PACKED_LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
-  #else
-  #ifdef MSVC_PKG_DEBUG_RUNTIME
-    Name = "pyuno_d.pyd";
-  #else
-    Name = "pyuno.pyd";
-  #endif // MSVC_PKG_DEBUG_RUNTIME
-  #endif
-End
-
-STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader )
-
 File gid_File_Pyuno_Rdb
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program_Services;
@@ -109,16 +94,6 @@ File gid_File_Share_Registry_Pyuno_Xcd
     Name = "pyuno.xcd";
 End
 
-#ifdef UNX
-
-// pyuno.so even on Mac OS X, because it is a python module
-File gid_File_Pyuno
-    PACKED_LIB_FILE_BODY;
-    Name = "pyuno.so";
-End
-
-#endif
-
 #ifdef MINGW_SYSTEM_PYTHON
 
 // python_wrapper.exe

scp2/source/python/module_python.scp

@@ -38,17 +38,8 @@ Module gid_Module_Pyuno
             gid_Dir_Py_PythonCore,
             gid_Dir_Py_PythonCore_Bin,
             gid_Dir_Py_PythonCore_Lib);
-/* right now auto_python_ALL just seems to contain the python core, which we don't need
-   with system-python -  and if this is empty the next one (gid_File_Pyuno) apparently doesn't
-   correctly end up here. */
-    Files = (
-#ifndef SYSTEM_PYTHON
-             auto_python_ALL,
-#endif
-             gid_File_Pyuno,
+    Files = (auto_python_ALL,
              gid_File_Pyuno_Rdb,
-             gid_File_Lib_Pyuno,
-             gid_File_Lib_Pythonloader,
              gid_File_Py_Bin_Python,
              gid_File_Py_Python_Core,
              gid_File_Py_Python_Bin,