Commit Graph

127 Commits

Author SHA1 Message Date
1e4422a4b4 re-base on ALv2 code. Includes:
Patches contributed by Mathias Bauer
        gnumake4 work variously
        http://svn.apache.org/viewvc?view=revision&revision=1394707
        http://svn.apache.org/viewvc?view=revision&revision=1394326
        http://svn.apache.org/viewvc?view=revision&revision=1397337
        http://svn.apache.org/viewvc?view=revision&revision=1397315
        http://svn.apache.org/viewvc?view=revision&revision=1396797

	Patches contributed by Andre Fischer
	Fixed getcsym.awk to handle #-comments that contain special regexp chars.
        http://svn.apache.org/viewvc?view=revision&revision=1230971
	118778: Added ADDITIONAL_REPOSITORIES environment variable and its
	automatic setup in configure.
        http://svn.apache.org/viewvc?view=revision&revision=1232004
	118160: Added external CoinMP library.
        http://svn.apache.org/viewvc?view=revision&revision=1233909

	Patches contributed by Herbert Duerr
	#i119168# use generic LICENSE file for langpacks and sdks
        http://svn.apache.org/viewvc?view=revision&revision=1310178
	macosxotoolhelper: need to quote perl regexp if it may contain regexp metachars
        http://svn.apache.org/viewvc?view=revision&revision=1183367
	allow gbuild with empty sysroot on linux
        http://svn.apache.org/viewvc?view=revision&revision=1179186

	Patches contributed by Ingo Schmidt
	native373: #164472# improvements for msi database
        http://svn.apache.org/viewvc?view=revision&revision=1167540
        http://svn.apache.org/viewvc?view=revision&revision=1167539

	Patches contributed by Jurgen Schmidt
	adapt setup package scripts to handle special DS_Store file for
	developer snapshot builds
        http://svn.apache.org/viewvc?view=revision&revision=1232430
	imported patch extensions_i117681.patch
	http://svn.apache.org/viewvc?view=revision&revision=1172102

	Patches contributed by Michael Stahl
	gbuild: RepositoryFixes.mk should be optional
        http://svn.apache.org/viewvc?view=revision&revision=1166123
	xslt filter: remove the FLA horror
	wordml import filter: replace FLA usage with plain XSLT
	http://svn.apache.org/viewvc?view=revision&revision=1363727

	Patch contributed by Oliver-Rainer Wittmann
	i#88652: applied patch, remove unicows deps
	http://svn.apache.org/viewvc?view=revision&revision=1177585

    Remove lots of OS2 conditionals, re-extract Rhino Java, unwind
    cppunit pieces, cleanup Mac image bits, remove coin-mp and
    re-package lpsolve, Oxygen & Crystal, fixup qstart bits, expand
    MPLv2 subset checking.

Change-Id: Iad5c8a76399620b892671633c0d8c29996db3564
2013-06-03 11:41:36 +01:00
7b91e84c72 Optional pyuno module should have its own services/pyuno.rdb
...this e.g. changes the error message when trying to register an extension that
contains an (actively registered) Python component but no pyuno is installed
from "Binary URP bridge disposed during call" to a less frightening "The service
com.sun.star.loader.Python cannot be instantiated."

Change-Id: I10f2b36b11395559ee95ce659878222b5ea99c11
2013-05-28 16:02:46 +02:00
32e7165285 Entries for symlinks in the Python framework seem unnecessary now
Change-Id: I63e0ceb42db5c561cafaae160259ee7f2658552c
2013-05-16 16:21:28 +03:00
87bdc30851 Add the Versions/3.3/include/python3.3m directory
Change-Id: If50acc088402487d8185198ee3841e3d82cd904c
2013-05-16 13:39:01 +03:00
b1e88b0dd5 Force create the symlinks-only dirs
Change-Id: I4610a2ff5bebd50dd2ee0020b575490c6c490968
2013-05-08 08:44:50 +02:00
233e12168b install python scripting provider using filelist
Change-Id: I9db93fd588f1cca9ce071d4ff14d5c9c699748a0
2013-05-04 16:44:47 +02:00
0548520425 bin no longer necessary hack
Change-Id: I54ca40343f4abe61aaea5520d27b4c82a2eeaf7a
Reviewed-on: https://gerrit.libreoffice.org/3780
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-04 14:43:20 +00:00
6cac17078c install python framework using filelist
Change-Id: Ib3a98d8268d0a1973d5f06b993c293fd41ba47e1
Reviewed-on: https://gerrit.libreoffice.org/3779
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-04 14:43:03 +00:00
b6bcbb675a replace python-core zip built in pyuno with direct use of Package
- python3: deliver files to INSTDIR, with same layout as instset
  and do not deliver .lib files
- pyuno: remove obsolete python.bin targets
- pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX
  platforms (sadly it is apparently still needed for "system" python on
  MinGW)
- scp2: use the python3 filelist
  There is still a problem here because the installer does not currently
  allow to preserve the executable bit on files in a filelist
- RepositoryExternal: run python executable from INSTDIR
  and link against libraries in UnpackedTarball dir

Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832
Reviewed-on: https://gerrit.libreoffice.org/3525
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-04-22 11:33:25 +00:00
849f87db1d pyuno.pyd must be called pyuno_d.pyd with MSVC debug runtimes
Change-Id: I8ed937739d94bfc6316d9cb158870362a0b8b996
2013-04-21 15:00:51 +02:00
03a36ed0fb fdo#60949: Move more libs to OOOLIBS
Change-Id: Ibd45f7004f8eaa151b9a60d7369d396411f60a2b
Reviewed-on: https://gerrit.libreoffice.org/3511
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-21 05:53:10 +00:00
687a821e3b fdo#63197: convert 3 out 4 from scripting part
Change-Id: Ie359d0ef00f62dd3c2d1f1dfd86e115409438e76
Reviewed-on: https://gerrit.libreoffice.org/3470
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-19 04:05:13 +00:00
4811c2dc9f adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3

lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.

openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.

Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
2013-04-15 15:26:32 +02:00
dcdc7bf552 install librelogo using filelists
Change-Id: Iffd409c66608d4e67eee9e149f0063f09e0e4675
2013-04-14 13:52:27 +02:00
73510ca8b3 sync packinfo with scp2
Change-Id: Ie20dab628e089a97c16b91b080eda5e09bbbb46a
2013-03-12 10:21:02 +01:00
3545b0398e actually make new gid_Module_Script_Provider_For_Python being installed
Change-Id: I3440a45465fa79d3ace0f04fd6036734c9caf00d
2013-03-12 00:05:08 +01:00
28db5d7f27 Script Provider For Python has to be a in a separate module
Change-Id: I6445108c049d6ee67df6b01966e1a047e169227c
2013-03-11 19:52:27 +01:00
c0ef3bb114 fix helppack creation on windows
Change-Id: I0242cc0adda1d12a9daac38bebe810aa38d2865b
2013-02-25 19:20:30 -05:00
1d84e9d1d3 instsetoo_native: convert to gbuild
Removes:
 * instsetoo_native/util/update.xml
      - gen_update_info.pl can be removed ?

      On Windows the binary artifacts are created now in:
      workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259eeeed49
Reviewed-on: https://gerrit.libreoffice.org/2242
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-02-24 17:26:19 +00:00
83b4703137 fdo#49202 install the "Python-UNO Bridge" component on Windows unconditionally
Change-Id: I1d9d62b024c4442182d67d93915af0f793265ebd
2013-02-20 16:30:14 +01:00
31f1a12ca5 LibreLogo should be an optional module
On Windows it is installed by default, but can be disabled in
the installer easily.

Change-Id: Ic820f08b51edf71eb09fd3533dc42b82bd06bb38
2012-12-12 00:10:26 +01:00
78234602ce LibreLogo integration (extension -> normal code)
While efforts have been made to make LibreLogo work with Python 3.3,
there are still a few bugs, for example large Logo programs do not run
correctly and Translate button does not work. Bugfixing is in progress.

Change-Id: I4227ff86084f51047861897189d2317322296139
2012-11-28 21:22:47 +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
48d7e996a2 Long URL does not fit into installer dialog
Change-Id: Iebefcca082a733e26072c5cc0ab0510b9eb2c509
2012-09-09 12:37:04 +02:00
20b2d07bde add missing quotes
Change-Id: Ic93eebd5fbad25479560e56cd3a2c1da035da45d
2012-06-22 13:57:36 +02:00
d712218cc0 fixing pyuno bridge on mingw: packaging system-python
Change-Id: Ib46248d217b0161dc20dde0274842bd7381f0cda
2012-06-22 13:11:41 +02:00
b6db3e3acc re-base on ALv2 code.
Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
2012-06-21 13:11:06 +01:00
e16ac69372 gbuild migration: pyuno module
Change-Id: I7f923a5622214f7540a789bcdd93bf6fd1d166db
2012-06-14 11:40:23 +02:00
cdf8d40394 gbuildize scp2
Change-Id: If9a0906a76943160cfdbd647b26a801bc4389615
2012-05-29 07:34:18 +02:00
2ea723e8ce Revert "Mac OS X uses .dylib and not .so for python modules."
This reverts commit b53a86a5676d5bcb88ed6e3ac524a3560e713c22.
Conflicts:
	scp2/source/python/file_python.scp

I assume that the file *shall* be named .so on Mac OS X after all, and that it
actually being named .dylib was a mistake introduced with
a09ce46818fd4d5e08b3af9a478501cd8ef5b4fe and reverted with
0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290.
2012-02-06 15:53:46 +01:00
75d215d473 Fix typo and clean up. 2011-12-16 09:53:31 +01:00
13087fc6a1 Python mailmerge stuff is now inside mailmerge.zip 2011-12-07 17:43:42 +01:00
2578d13ea8 add exectuable rights for libraries on Linux
RPM strips debuginfo packages from libraries only when they have
execuateble rights

It does not fix permissions of the prebuilt mozilla libraries; scp2 defines
the same permissions for all files inside the mozruntime.zip archive.
Unfortuantely, it icludes libraries and data files togetger.
2011-12-01 18:43:49 +01:00
e4610ffd2d remove PCH support in dmake-module 2011-11-27 12:26:12 -06:00
b338e513f7 change URL pointing to openoffice.org domain - fdo#39734 2011-11-19 22:43:33 +01:00
0559950864 Made ooinstall more deterministic, fixed Mac OS X Python module dependencies. 2011-11-01 11:17:07 +01: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
2ff63bcdea Undo basis/brand split: merge basis share/ into brand share/. 2011-10-07 22:06:28 +02:00
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
8c81266fba Add /instsetoo_native to .gitignore 2011-05-07 17:39:13 -07:00
a1d3641e9c install the new msgbox.py helper 2011-05-06 14:52:18 +01:00
61a4bf5a07 Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	set_soenv.in
2011-03-17 16:06:07 +01:00
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
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
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
03218dbc3a transform script providers into extensions 2010-11-06 07:11:12 +01:00
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
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