diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:15:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:59:17 +0200 |
| commit | f01aa96eab0ac6b068cff53ee03c10beff662f2d (patch) | |
| tree | 3244b125bf65fdf75173aaa459b7dceafb70c030 /scp2 | |
| parent | 5ac6c4818aa533746c84c1a42fb07b82bc7ec713 (diff) | |
scp2: move python libraries to AutoInstall
Change-Id: Ib89daf3e608fd995845062eae2a7a33149964844
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 25 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 11 |
3 files changed, 2 insertions, 36 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 1958e746f4a2..1fe02e5328f5 100644 --- a/scp2/AutoInstall.mk +++ b/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)) diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 43a83163fbad..b2595ce400fd 100644 --- a/scp2/source/python/file_python.scp +++ b/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 diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index a4a152a815bd..d9cf73c816fd 100644 --- a/scp2/source/python/module_python.scp +++ b/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, |