mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
294,990 Commits 1 Branch 0 Tags
2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2
Commit Graph

90 Commits

Author SHA1 Message Date
Stephan Bergmann
2ff63bcdea Undo basis/brand split: merge basis share/ into brand share/. 2011-10-07 22:06:28 +02:00
Joseph Powers
b53a86a567 Mac OS X uses .dylib and not .so for python modules. 
At least this works better on my system.
 2011-05-07 17:56:38 -07:00
Joseph Powers
8c81266fba Add /instsetoo_native to .gitignore 2011-05-07 17:39:13 -07:00
Michael Meeks
a1d3641e9c install the new msgbox.py helper 2011-05-06 14:52:18 +01:00
Jan Holesovsky
61a4bf5a07 Merge remote-tracking branch 'origin/integration/dev300_m101' 
Conflicts:
	set_soenv.in
 2011-03-17 16:06:07 +01:00
Hanno Meyer-Thurow
ff33fd9d5d 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)
 2011-03-14 18:47:10 +01:00
Norbert Thiebaud
f0e5895d5b Merge commit 'ooo/DEV300_m101' into integration/dev300_m101 
* commit 'ooo/DEV300_m101': (500 commits)
  masterfix DEV300: #i10000# remove hard dep
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i100000# dep. fix
  masterfix DEV300: #i10000# removed one hard dep
  masterfix DEV300: #i10000# fixed patch handling
  masterfix DEV300: #i10000# new configure
  DEV300
  masterfix DEV300: #i10000# nawk -> awk
  l10nmove: adjust repository handling
  l10nmove: fixed regex
  l10nmove: minor fixes
  l10nmove: add l10n repo to gb_REPOS
  DEV300 masterfix: gnumake3: subsequenttests requires  in environment
  ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
  DEV300 masterfix: #i10000#: windows: more bizare hacks ...
  locales34: have a matching configure as well
  DEV300
  locales34: back out change from autoreconf
  gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
  ...

Conflicts:
	configure
	configure.in
	instsetoo_native/prj/build.lst
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	instsetoo_native/util/pack.lst
	ooo.lst
	scp2/source/canvas/canvascommons.scp
	scp2/source/canvas/mtfrenderer.scp
	scp2/source/ooo/common_brand.scp
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/file_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/module_langpack.ulf
	scp2/source/ooo/ure.scp
	scp2/source/python/file_python.scp
	scp2/source/sdkoo/sdkoo.scp
	scp2/source/templates/module_langpack_accessories_templates.sct
	scp2/source/templates/module_langpack_accessories_templates_root.sct
	set_soenv.in
	soldep/bootstrp/appdef.cxx
	soldep/bootstrp/dep.cxx
	soldep/bootstrp/hashtbl.cxx
	soldep/bootstrp/makefile.mk
	soldep/bootstrp/minormk.cxx
	soldep/bootstrp/prj.cxx
	soldep/bootstrp/prodmap.cxx
	soldep/inc/dep.hxx
	soldep/inc/minormk.hxx
	soldep/inc/prodmap.hxx
	soldep/inc/soldep/appdef.hxx
	soldep/inc/soldep/connctr.hxx
	soldep/inc/soldep/depper.hxx
	soldep/inc/soldep/depwin.hxx
	soldep/inc/soldep/hashtbl.hxx
	soldep/inc/soldep/objwin.hxx
	soldep/inc/soldep/prj.hxx
	soldep/inc/soldep/sdtresid.hxx
	soldep/inc/soldep/soldep.hxx
	soldep/inc/soldep/soldlg.hxx
	soldep/inc/soldep/tbox.hxx
	soldep/prj/d.lst
	soldep/source/connctr.cxx
	soldep/source/depapp.hxx
	soldep/source/depper.cxx
	soldep/source/depwin.cxx
	soldep/source/makefile.mk
	soldep/source/objwin.cxx
	soldep/source/soldep.cxx
	soldep/source/soldlg.cxx
	soldep/source/soldlg.src
	soldep/source/tbox.cxx
	solenv/bin/build.pl
	solenv/bin/cws.pl
	solenv/bin/make_installer.pl
	solenv/bin/mhids.pl
	solenv/bin/modules/CwsConfig.pm
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/modules/installer/regmerge.pm
	solenv/bin/modules/installer/scriptitems.pm
	solenv/bin/modules/installer/servicesfile.pm
	solenv/bin/modules/installer/simplepackage.pm
	solenv/bin/modules/installer/substfilenamefiles.pm
	solenv/config/ssolar.cmn
	solenv/inc/_tg_rslb.mk
	solenv/inc/extension_post.mk
	solenv/inc/libs.mk
	solenv/inc/minor.mk
	solenv/inc/postset.mk
	solenv/inc/settings.mk
	solenv/inc/tg_rslb.mk
	solenv/inc/unxlng.mk
	solenv/inc/wntmsc.mk
	soltools/HIDCompiler/hidclex.l
	stlport/prj/d.lst
	stlport/systemstlguards/postextstl.h
 2011-03-08 19:43:29 -06:00
Petr Mladek
19a19d5220 find the internal libpython (fdo#31764) 
libpython2.6.so symlink was not created, so pyuno was not able to find the
internal libpython2.6.so.1.0
 2010-11-23 15:55:56 +01:00
David Tardon
03218dbc3a transform script providers into extensions 2010-11-06 07:11:12 +01:00
Caolán McNamara
0fd6918144 AIX tweaks 2010-10-13 20:29:38 +01:00
sb
c096e86385 sb129: #i113189# change UNO components to use passive registration 2010-09-10 13:10:07 +02:00
Ingo Schmidt
5505fa9662 native306 #i111497,i111501# Patches for MacOSX Python from Cloph 2010-06-04 11:05:31 +02:00
sb
dffd8ec02a sb111: merged in DEV300_m72 2010-02-25 13:53:42 +01:00
Jens-Heiner Rechtien
f281d77a21 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
sb
86f98daab3 merged in DEV300_m57 2009-09-04 12:24:40 +02:00
Vladimir Glazounov
412727e371 CWS-TOOLING: integrate CWS sb110 
2009-08-05 15:28:43 +0200 sb  r274677 : CWS-TOOLING: rebase CWS sb110 to trunk@274622 (milestone: DEV300:m54)
2009-08-05 11:46:36 +0200 sb  r274646 : #i104018# fixed previous svn changeset 271712 (from issue 101244)
2009-07-20 14:41:56 +0200 sb  r274138 : CWS-TOOLING: rebase CWS sb110 to trunk@273858 (milestone: DEV300:m52)
2009-06-02 11:42:17 +0200 sb  r272489 : CWS-TOOLING: rebase CWS sb110 to trunk@272291 (milestone: DEV300:m49)
2009-05-08 12:46:51 +0200 sb  r271712 : #i101244# after DLLs have been moved from basis to brand layer on Windows, code that used SvtPathOptions::GetModulePath to located libraries had to be adapted
2009-05-08 10:10:43 +0200 sb  r271703 : #i101244# for performance reasons, on Windows move DLLs from basis to brand layer (i.e., next to executables); consequently eliminated some library duplications across the layers; adapted various code to the move
2009-05-08 09:54:44 +0200 sb  r271702 : #i101244# hardwire Python dynamic libraries and script files into base layer (even if other dynamic libraries will move to brand layer on Windows), mainly because the pyuno dynamic library is both linked against from other dynamic libraries (pythonloader.uno) and accessed via "import pyuno" from Python scripts
2009-05-07 17:18:30 +0200 sb  r271686 : #i101244# support NativeServicesURLPrefix on individual files; to implement that, changed meaning of global unomaxservices
2009-05-07 17:15:24 +0200 sb  r271685 : #i101244# take legacy_binfilters.rdb explicitly from $OOO_BASE_DIR/program (instead of implicitly next to some dynamic library); cleaned up dead code
2009-05-07 17:12:12 +0200 sb  r271684 : #i101244# take senddoc.exe explicitly from $OOO_BASE_DIR/program (instead of implicitly next to some dynamic library)
2009-05-07 17:11:33 +0200 sb  r271683 : #i101244# take odbcconfig.exe explicitly from $OOO_BASE_DIR/program (instead of implicitly next to some dynamic library)
2009-05-07 17:09:44 +0200 sb  r271682 : #i101244# read configmgr ini file explicitly from $OOO_BASE_DIR/program (instead of next to configmgr dynamic library)
 2009-08-25 13:07:56 +00:00
sb
d6d81df3a1 #i101955# consolidating xcs/xcu files in xcd files (for now in new postprocess/packregistry); extended configmgr2 to search for multiple xcd files per layer; removed some (relative, wrong) DOCTYPE SYSTEM paths from xcu files to avoid xsltproc warnings; extended scp2 EXTRA_ALL_LANG to work with extensions other than zip (i.e., xcd) 2009-08-04 10:36:31 +02:00
Release Engineers
e4d61f22b3 CWS-TOOLING: integrate CWS mingwport19 
2009-04-23 16:09:03 +0200 tono  r271180 : revert changes
2009-04-20 15:15:31 +0200 tono  r270988 : i101223: MinGW port: atl patch fix
2009-04-14 14:54:29 +0200 tono  r270779 : i101077: mingw port: make python to work with OOo
2009-04-14 14:52:46 +0200 tono  r270777 : i101073: Mingw port fix: openssl 0.9.8k in cygwin case
 2009-05-04 11:45:11 +00:00
Ivo Hinkelmann
0bcb4e9272 CWS-TOOLING: integrate CWS python26 
2009-04-22 11:57:41 +0200 obo  r271091 : #i101079# mingw port (by tono)
2009-04-22 11:56:37 +0200 obo  r271090 : #i101079# mingw port (by tono)
2009-04-22 11:55:55 +0200 obo  r271089 : #i101079# mingw port (by tono)
2009-04-22 11:26:00 +0200 obo  r271084 : #i100492# Patch for FreeBSD (by maho)
2009-04-21 10:19:01 +0200 obo  r271020 : #i92413# make python buildable in Hamburg RE environment
2009-04-17 15:52:57 +0200 obo  r270952 : #i10000# fix for 4NT shell support
2009-04-17 15:16:39 +0200 hjs  r270951 : #i92413# - remove gcc warnings about new struct member. fetched fomr DEV300
2009-04-17 10:30:28 +0200 sb  r270927 : #i92413# adaptions for Solaris and/or bash
2009-04-16 00:36:32 +0200 jbu  r270861 : #i101080# patch for bash environment provided by tono
2009-04-15 13:50:01 +0200 rene  r270842 : #i100997# allow also python < 2.6 again
2009-03-12 14:23:32 +0100 rene  r269410 : cleanup: remove Python 2.3.4 - not referenced anymore
2009-03-11 21:48:58 +0100 jbu  r269356 : native python modules pyuno.dll -> pyuno.pyd (required by 2.6 python runtime)
2009-03-11 11:11:43 +0100 rene  r269307 : fix typo; regen configure
2009-03-10 11:44:54 +0100 rene  r269262 : update _AM_PYTHON_INTERPRETER_LIST
2009-03-10 00:30:09 +0100 jbu  r269233 : python26 now builds on windows (installation set not built yet)
2009-03-06 21:45:20 +0100 jbu  r269050 : python 2.6.1-linuxx86: PYTHONHOME variable removed from set_soenv.in (is now unecessary), added new and removed old python blob, linux x86 builds without patches, windows build still needs to be done and is now broken
2009-03-06 14:08:33 +0100 rene  r269004 : #i92413#
 2009-04-22 14:05:37 +00:00
Rüdiger Timm
62b009474c 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
Ivo Hinkelmann
cd6ecd162b INTEGRATION: CWS native168 (1.7.118); FILE MERGED 
2008/07/10 15:10:35 is 1.7.118.1: #158212# avoid same files at different modules
 2008-07-17 15:34:45 +00:00
Rüdiger Timm
7b9addfc13 INTEGRATION: CWS sb87 (1.12.16); FILE MERGED 
2008/05/19 14:19:34 jsc 1.12.16.2: #i88211# remove pythonmsi.dll, custom setup action
2008/05/09 15:09:40 sb 1.12.16.1: #i88211# python start wrapper moved to brand layer
 2008-06-09 11:54:26 +00:00
Rüdiger Timm
af88093aa1 INTEGRATION: CWS sb87 (1.14.16); FILE MERGED 
2008/05/09 15:09:40 sb 1.14.16.1: #i88211# python start wrapper moved to brand layer
 2008-06-09 11:54:15 +00:00
Rüdiger Timm
a7cd2340f7 INTEGRATION: CWS sb87 (1.18.16); FILE MERGED 
2008/05/19 14:19:34 jsc 1.18.16.2: #i88211# remove pythonmsi.dll, custom setup action
2008/05/09 15:09:40 sb 1.18.16.1: #i88211# python start wrapper moved to brand layer
 2008-06-09 11:54:01 +00:00
Vladimir Glazounov
c1755d0faf INTEGRATION: CWS native141 (1.5.16); FILE MERGED 
2008/04/09 16:39:50 is 1.5.16.1: #i88109# no packages at nodes in java installer
 2008-04-15 13:59:19 +00:00
Rüdiger Timm
648d711dc5 INTEGRATION: CWS changefileheader (1.9.180); FILE MERGED 
2008/03/31 16:07:32 rt 1.9.180.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:50:33 +00:00
Rüdiger Timm
f2863273a1 INTEGRATION: CWS changefileheader (1.4.408); FILE MERGED 
2008/03/31 16:07:32 rt 1.4.408.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:50:19 +00:00
Rüdiger Timm
270043e3c3 INTEGRATION: CWS changefileheader (1.5.8); FILE MERGED 
2008/03/31 16:07:32 rt 1.5.8.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:50:01 +00:00
Rüdiger Timm
019c904461 INTEGRATION: CWS changefileheader (1.8.408); FILE MERGED 
2008/03/31 16:07:32 rt 1.8.408.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:49:46 +00:00
Rüdiger Timm
ce682e562c INTEGRATION: CWS changefileheader (1.11.194); FILE MERGED 
2008/03/31 16:07:32 rt 1.11.194.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:49:30 +00:00
Rüdiger Timm
c328ca9c48 INTEGRATION: CWS changefileheader (1.13.842); FILE MERGED 
2008/03/31 16:07:31 rt 1.13.842.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:49:13 +00:00
Rüdiger Timm
d363f7a3a8 INTEGRATION: CWS changefileheader (1.17.8); FILE MERGED 
2008/03/31 16:07:31 rt 1.17.8.1: #i87441# Change license header to LPGL v3.
 2008-04-10 08:48:31 +00:00
Vladimir Glazounov
d997504de3 INTEGRATION: CWS sb83 (1.4.86); FILE MERGED 
2008/01/29 16:00:25 sb 1.4.86.2: #i85112# merged in cws_src680_native121
2007/12/10 14:48:11 sb 1.4.86.1: #152274# Include PyUno in StarOffice.
 2008-03-18 12:37:37 +00:00
Vladimir Glazounov
f4c4bef094 INTEGRATION: CWS sb83 (1.16.644); FILE MERGED 
2007/12/10 14:48:11 sb 1.16.644.1: #152274# Include PyUno in StarOffice.
 2008-03-18 12:37:16 +00:00
Kurt Zenker
6e8ee38aaf INTEGRATION: CWS pyunofixes4 (1.8.522); FILE MERGED 
2007/08/07 20:38:59 jbu 1.8.522.1: #i56236# fix the nameclash between the  PYTHONPATH environment variable and the loader bootstrap parameter by adding the PYUNO_LOADER prefix
 2007-10-11 10:53:12 +00:00
Kurt Zenker
968554782e INTEGRATION: CWS native100 (1.3.542); FILE MERGED 
2007/08/23 14:49:58 is 1.3.542.1: #i80937# introducing module order
 2007-09-06 09:09:36 +00:00
Kurt Zenker
6b682b1975 INTEGRATION: CWS native100 (1.10.530); FILE MERGED 
2007/08/23 14:49:58 is 1.10.530.1: #i80937# introducing module order
 2007-09-06 09:09:23 +00:00
Ivo Hinkelmann
fd1a164041 INTEGRATION: CWS mergede01 (1.3.352); FILE MERGED 
2007/03/19 15:24:05 ihi 1.3.352.1: #i72301# Remove German
 2007-04-19 14:33:32 +00:00
Ivo Hinkelmann
fbabb77dc3 INTEGRATION: CWS mergede01 (1.7.394); FILE MERGED 
2007/03/19 15:24:04 ihi 1.7.394.1: #i72301# Remove German
 2007-04-19 14:33:19 +00:00
Oliver Bolte
60331f538e INTEGRATION: CWS pyunofixes2 (1.7.62); FILE MERGED 
2006/01/11 22:07:52 jbu 1.7.62.1: #i55157# added lib/site-packages to PYTHONPATH
 2006-03-22 09:57:50 +00:00
Oliver Bolte
f9db36a3b8 INTEGRATION: CWS pyunofixes2 (1.7.128); FILE MERGED 
2006/01/07 22:17:33 jbu 1.7.128.2: RESYNC: (1.7-1.9); FILE MERGED
2006/01/07 20:03:01 jbu 1.7.128.1: #i54532# added officehelper.py (provided by Christian Junker)
 2006-03-22 09:57:24 +00:00
Oliver Bolte
3c4cdd397e INTEGRATION: CWS pyunofixes2 (1.10.26); FILE MERGED 
2006/01/07 22:17:48 jbu 1.10.26.2: RESYNC: (1.10-1.13); FILE MERGED
2006/01/07 20:03:01 jbu 1.10.26.1: #i54532# added officehelper.py (provided by Christian Junker)
 2006-03-22 09:56:59 +00:00
Rüdiger Timm
3932c93c22 INTEGRATION: CWS pj50 (1.2.144); FILE MERGED 
2006/02/06 20:25:43 pjanik 1.2.144.1: #i61622#: Remove reference to SISSL.
 2006-03-08 13:15:51 +00:00
Rüdiger Timm
fbfc4381fb INTEGRATION: CWS localisation05 (1.2.36); FILE MERGED 
2006/01/30 10:10:56 vg 1.2.36.1: #130748#,#130747# Wrong encoding (german)
 2006-02-06 16:29:50 +00:00
Oliver Bolte
65d07176e1 INTEGRATION: CWS cmcfixes23 (1.13.26); FILE MERGED 
2005/11/29 13:20:07 cmc 1.13.26.1: #i58137# move emailmerge component outside internal python only ifdef
 2006-01-20 09:57:38 +00:00
Oliver Bolte
0666624278 INTEGRATION: CWS macosxpython (1.13.80); FILE MERGED 
2006/01/07 09:16:18 pjanik 1.13.80.1: #i60099#: Shared objects for Python have .so suffix on Mac OS X as well.
 2006-01-16 14:57:11 +00:00
Rüdiger Timm
c18da3bb90 INTEGRATION: CWS native37 (1.1.2); FILE ADDED 
2006/01/09 15:59:01 is 1.1.2.1: #i60260# new mailmerge module
 2006-01-10 14:34:43 +00:00
Rüdiger Timm
5b6f7c58e5 INTEGRATION: CWS native37 (1.6.6); FILE MERGED 
2006/01/09 16:00:02 is 1.6.6.1: #i60260# new mailmerge module
 2006-01-10 14:34:26 +00:00
Rüdiger Timm
fd7467b7e3 INTEGRATION: CWS native37 (1.12.86); FILE MERGED 
2006/01/09 15:59:57 is 1.12.86.1: #i60260# new mailmerge module
 2006-01-10 14:34:10 +00:00
Vladimir Glazounov
c1c3dafe1c #i59953#,#100000# changed Python-UNO Bridge module name and added description 2006-01-06 12:43:45 +00:00