diff options
| author | Hanno Meyer-Thurow <h.mth@web.de> | 2011-03-13 16:07:50 +0100 |
|---|---|---|
| committer | Hanno Meyer-Thurow <h.mth@web.de> | 2011-03-14 18:47:10 +0100 |
| commit | ff33fd9d5d5be99bebe6ab34da333fd641af3ed6 (patch) | |
| tree | 28398fdaee71c556fce4e450b5af933f46cd3f6e /scp2/source/python | |
| parent | 66f1625c2f714cf979365a731d9b05be04127187 (diff) | |
Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
available for more than two years. Noone cares, therefore rest in peace.
Python2 is going to be ditched at some point. Simply do not fail then.
Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
interesting for Linux Distributions. Enforce the user to place JVMs in one
base directory.
5. Fix build for libxml-2.7.8 with ICU support.
* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
Diffstat (limited to 'scp2/source/python')
| -rw-r--r-- | scp2/source/python/file_python.scp | 4 | ||||
| -rw-r--r-- | scp2/source/python/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 4 | ||||
| -rw-r--r-- | scp2/source/python/module_python_mailmerge.scp | 2 | ||||
| -rw-r--r-- | scp2/source/python/profileitem_python.scp | 4 |
5 files changed, 18 insertions, 0 deletions
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 1228900121b7..ee2186bf5fc1 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#ifndef DISABLE_PYUNO + File gid_File_Lib_Pyuno TXT_FILE_BODY; #ifdef UNX @@ -310,3 +312,5 @@ End #endif +// DISABLE_PYUNO +#endif diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk index 4e03218ff06a..f3bff44cb582 100644 --- a/scp2/source/python/makefile.mk +++ b/scp2/source/python/makefile.mk @@ -37,11 +37,15 @@ TARGETTYPE=CUI .INCLUDE : settings.mk +.IF "$(DISABLE_PYTHON)" == "TRUE" +SCPDEFS+=-DDISABLE_PYUNO +.ELSE .IF "$(SYSTEM_PYTHON)" == "YES" SCPDEFS+=-DSYSTEM_PYTHON .ELSE .INCLUDE : pyversion.mk .ENDIF +.ENDIF SCPDEFS+=\ -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \ diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 3b017720dc4a..eef393917432 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#ifndef DISABLE_PYUNO + Module gid_Module_Optional_Pyuno PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); @@ -37,3 +39,5 @@ Module gid_Module_Optional_Pyuno Default = YES; Styles = ( ); End + +#endif diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp index 9ad34a2908f0..b14162c2dc78 100644 --- a/scp2/source/python/module_python_mailmerge.scp +++ b/scp2/source/python/module_python_mailmerge.scp @@ -28,6 +28,7 @@ #include "macros.inc" #ifndef AIX +#ifndef DISABLE_PYUNO File gid_File_Pymailmerge TXT_FILE_BODY; Dir = gid_Dir_Program; @@ -36,3 +37,4 @@ File gid_File_Pymailmerge Styles = (PACKED,UNO_COMPONENT); End #endif +#endif diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index 1c4fdb077986..e0ceceead612 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -27,6 +27,7 @@ #include "macros.inc" +#ifndef DISABLE_PYUNO Profile gid_Profile_Pythonloader_Uno_Ini ModuleID = gid_Module_Optional_Pyuno; @@ -92,3 +93,6 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath #endif #endif End + +// DISABLE_PYUNO +#endif |