diff options
| author | David Ostrovsky <d.ostrovsky@gmx.de> | 2012-06-18 00:04:19 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-06-22 13:11:41 +0200 |
| commit | d712218cc0b658fae66f63c52af7996b714289c9 (patch) | |
| tree | 74ebe377301f044f5ebd13d7e0ef645817c24dc0 /scp2 | |
| parent | 3f5245db4b0248bb55c37d3400b8155263880f6e (diff) | |
fixing pyuno bridge on mingw: packaging system-python
Change-Id: Ib46248d217b0161dc20dde0274842bd7381f0cda
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_python.mk | 9 | ||||
| -rw-r--r-- | scp2/source/python/file_python.scp | 44 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 3 |
3 files changed, 54 insertions, 2 deletions
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 53d08911fba9..9a2004b405ec 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -40,6 +40,15 @@ else ifeq ($(SYSTEM_PYTHON),YES) $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DSYSTEM_PYTHON \ )) + +# mingw: mix mode copy file from system python to installation set +ifeq ($(GUI)$(COM),WNTGCC) +$(eval $(call gb_InstallModule_add_defs,scp2/python,\ + -DPYVERSION=$(MINGW_PYVERSION) \ + -DMINGW_SYSTEM_PYTHON \ +)) +endif + else include $(OUTDIR)/inc/pyversion.Makefile diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 47ab5fecb93b..8ffc79c7c20a 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -310,7 +310,7 @@ Unixlink gid_Unixlink_Python_libpython Styles = (); End #endif //MACOSX -#endif +#endif //SYSTEM_PYTHON #ifdef UNX @@ -324,5 +324,47 @@ End #endif +#ifdef MINGW_SYSTEM_PYTHON + +// python_wrapper.exe +File gid_File_Py_Bin_Python + BIN_FILE_BODY; + Name = EXENAME(pyuno/python); + Dir = gid_Brand_Dir_Program; + Styles = (PACKED); +End + +Directory gid_Dir_Py_PythonCore + ParentID = gid_Brand_Dir_Program; + HostName = STRING(CONCAT2(python-core-,PYVERSION)); +End + +Directory gid_Dir_Py_PythonCore_Lib + ParentID = gid_Dir_Py_PythonCore; + HostName = "lib"; +End + +File gid_File_Py_Python_Core + TXT_FILE_BODY; + Dir = gid_Dir_Py_PythonCore_Lib; + Name = STRING(CONCAT3(python-core-,PYVERSION,.zip)); + Styles = (ARCHIVE); +End + +Directory gid_Dir_Py_PythonCore_Bin + ParentID = gid_Dir_Py_PythonCore; + HostName = bin; +End + +File gid_File_Py_Python_Bin + BIN_FILE_BODY; + Dir = gid_Dir_Py_PythonCore_Bin; + Name = EXENAME(python); + Styles = (PACKED); +End + + +#endif //MINGW_SYSTEM_PYTHON + // DISABLE_PYUNO #endif diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 0f15826b90ad..d379f2744f6d 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -41,7 +41,8 @@ Module gid_Module_Optional_Pyuno gid_Dir_PythonFramework_Versions_ver_lib, gid_Dir_PythonFramework_Versions_ver_lib_pythonver, gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config, - gid_Dir_Py_PythonCore, gid_Dir_Py_PythonCore_Bin, + gid_Dir_Py_PythonCore, + gid_Dir_Py_PythonCore_Bin, gid_Dir_Py_PythonCore_Lib); Files = (gid_File_Pyuno, gid_File_Lib_Pyuno, |