Commit Graph

22 Commits

Author SHA1 Message Date
2e9ec0a8bc simplify processing of python.sh
Change-Id: I583407233fad1f7aaccc137642e5f134c3ba2874
2013-01-01 13:15:01 +01:00
38a22a9026 Switch from python to python3
Mac specific parts of patch by:
Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f
2012-11-27 12:45:23 +01:00
1d3e6bb6c4 re-base on ALv2 code. Removing:
a patch contributed by Pedro Giffuni to handle FreeBSD issues
    that are unlikely to be an issue with a two-layer LibreOffice.
    http://svn.apache.org/viewvc?view=revision&revision=1180509
2012-07-02 16:52:50 +01:00
a164d246f2 fdo#50682: Setting DYLD_LIBRARY_PATH in python script appears unnecessary
...and apparently has negative consequences (system CFNetwork framework picking
up LO libsqlite3.dylib instead of system one, as DYLD_LIBRARY_PATH overrides
recorded installnames).

Contrary to the old comment ("so that 'import pyuno' finds libpyuno.so"), what
setting LD_LIBRARY_PATH on Linux is still necessary for is so that python.bin
(a stripped version of the python executable from external python module) finds
libpython2.6.so, as it lacks an RPATH.  ('import pyuno' finds pyuno.so
apparently on PYTHONPATH, anyway, and pyuno.so in turn dlopen's
libpython.{dylib,so} with full path.)

(This might make dc82cf021f76ea83ff7a4bcb2d7525f2e111f0cc "Make PyUNO work
--with-macox-version-min-required=10.6" irrelevant.)

Change-Id: I1c3a6c61d4cc976d85956e587497a13a77689128
2012-06-22 12:07:16 +02:00
b786a33cfd Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation. 2011-10-24 13:59:58 +02:00
fecde94354 Undo basis/brand split: moved Python from basis to brand.
The Windows-only code in pyuno/zipcore/python.cxx may still need fixing.
2011-10-20 23:04:12 +02:00
41893e087a allow to use internal Python on Mac (Python built as framework) 2011-06-06 20:09:06 +02:00
aa5755e6dc tweak this for AIX 2010-10-13 20:31:42 +01:00
sb
3319239984 hb22: #b6982587# treat null LD_LIBRARY_PATH like unset one 2010-09-09 10:48:03 +02:00
7c80db2eb3 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
e591a08dc3 CWS-TOOLING: integrate CWS sb103
2009-01-15 15:28:08 +0100 sb  r266375 : #i97629# set UNO_PATH in python start program and use it in bootstrap function in officehelper.py (and do not erroneously encode a vnd.sun.star.pathname URE_BOOTSTRAP value in tools::extendApplicationEnvironment)
2009-01-15 10:40:17 +0100 sb  r266338 : #i97424# explicit shut down of ImplImageTree singleton in DeInitVCL still required
2009-01-14 12:07:15 +0100 sb  r266276 : CWS-TOOLING: rebase CWS sb103 to trunk@265758 (milestone: DEV300:m38)
2009-01-14 08:53:02 +0100 sb  r266266 : #i96284# remove implementation of unused (but expensive) link feature; plus some general cleanup
2009-01-08 14:42:59 +0100 sb  r266010 : #i96683# enable dlclose for GCC 3 (based on a patch by cmc)
2009-01-06 14:18:23 +0100 sb  r265920 : #i97424# spurious unreferenced local variables
2008-12-19 15:33:39 +0100 sb  r265727 : #i57359# no need for a special glibc 2.2.4 based libgcc_s.so.1 for URE any more as the general one used for OOo is guaranteed to be based on at least glibc 2.2.4, anyway
2008-12-19 13:54:37 +0100 sb  r265724 : #i97424# clean up and speed up vcl ImplImageTree
2008-12-18 14:28:10 +0100 sb  r265690 : #i97132# spread usage of the rtl::Static pattern (patch by cmc)
2008-12-15 14:33:00 +0100 sb  r265499 : #i90492# generate UTF-8 encoded output (patch by tora)
2008-12-15 11:45:05 +0100 sb  r265469 : #i95593# -Djava.library.path to find libtest_javauno_any.so
2008-12-15 11:23:14 +0100 sb  r265468 : #i93769# it appears that Java nowadays expects file URIs in UTF-8, so ExternalUriReferenceTranslator.toExternal must not be called
2008-12-10 12:02:50 +0100 sb  r265164 : #i93219# use (corrected) signal handling instead of forking again (to avoid unintended generation of core files)
2009-02-12 09:18:09 +00:00
392fb06810 CWS-TOOLING: integrate CWS sb101
2008-12-08 16:52:06 +0100 sb  r265009 : #i95330# python23.dll needs to be copied to brand layer, not just moved there
2008-11-24 18:15:54 +0100 sb  r264259 : #i95022# tools::extendApplicationEnvironment gets URE_BOOTSTRAP value from outside bootstrap.cxx, so needs to operate in LOOKUP_MODE_URE_BOOTSTRAP, too
2008-11-20 21:12:31 +0100 jbu  r264103 : deactivated debug log
2008-11-20 21:09:03 +0100 jbu  r264102 : #i95331# ld_library_path now contains ure/lib directory
2008-11-20 21:05:37 +0100 jbu  r264101 : #i95330# python.dll is now installed in the brand-program directory (unix remains unchanged)
2008-11-20 20:46:57 +0100 jbu  r264099 : #i95118# + #i93994# Python scripts in share and user uno packages now work again
2008-11-20 20:38:23 +0100 jbu  r264098 : #i95037# python wrapper now waits for completion of python executable and currectly returns the exit state
2008-11-20 10:46:28 +0100 sb  r264034 : #i95028# import socket, since on Windows sal3.dll no longer calls WSAStartup (and import socket does)
2008-11-18 17:01:09 +0100 sb  r263784 : #i96314# fixed encode()
2008-11-18 15:59:17 +0100 sb  r263779 : #i95024# missing vnd.sun.star.pathname: in URE_BOOTSTRAP
2008-11-18 13:51:36 +0100 sb  r263765 : #i95022# treat \ and $ verbatim in URE_BOOTSTRAP=vnd.sun.star.pathname values
2008-12-11 12:57:12 +00:00
ef92de3175 INTEGRATION: CWS sb87 (1.9.4); FILE MERGED
2008/05/09 15:11:10 sb 1.9.4.2: #i88211# improvements
2008/05/07 12:25:34 sb 1.9.4.1: #i88211# cleaned up; as somewhat of a hack, added -env:INIFILEPATH arg when starting python.bin so that a later defaultBootstrap_InitialComponentContext() will bootstrap into a complete OOo UNO env
2008-06-09 12:05:55 +00:00
6318878937 INTEGRATION: CWS changefileheader (1.8.60); FILE MERGED
2008/03/31 07:24:58 rt 1.8.60.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:36:52 +00:00
abda564c5e INTEGRATION: CWS pyunofixes2 (1.7.12); FILE MERGED
2006/01/11 21:36:14 jbu 1.7.12.1: #i55157# added lib/site-packages to PYTHONPATH
2006-03-22 09:53:59 +00:00
699d26c6fd INTEGRATION: CWS pythonlinkfix (0); FILE MERGED 2005-11-11 08:21:32 +00:00
87d2d3d47a INTEGRATION: CWS ooo19126 (1.5.38); FILE MERGED
2005/09/05 18:39:25 rt 1.5.38.1: #i54170# Change license header: remove SISSL
2005-09-08 15:55:24 +00:00
69d0ea954e INTEGRATION: CWS geordi2q15 (1.4.10); FILE MERGED
2004/02/20 12:50:06 hr 1.4.10.1: #111934#: merge CWS ooo111fix3
2004-02-25 13:11:42 +00:00
436aea2894 INTEGRATION: CWS geordi2q11 (1.3.8); FILE MERGED
2003/12/16 14:04:31 hr 1.3.8.1: #111934#: join CWS ooo111fix1
2003-12-17 17:47:10 +00:00
aa86ca7d03 INTEGRATION: CWS geordi2q01 (1.2.14); FILE MERGED
2003/08/18 13:04:40 hr 1.2.14.1: #i18350#: join changes from CWS ooo11rc3
2003-08-18 14:02:35 +00:00
743337cdbe #i11753# added the dynlib pythonpath element 2003-04-06 18:51:28 +00:00
b5e3182953 #i11753# python-core for OOo installation set is now zipped here 2003-04-06 16:33:08 +00:00