492 Commits

Author SHA1 Message Date
David Tardon
ed665f24ff copy pyuno files to instdir
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
2013-05-05 15:47:54 +02:00
Michael Meeks
72e5d0c8fb Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-30 13:34:06 +01:00
David Tardon
1cc9bbfd57 gbuild: drop empty use_packages calls
Change-Id: I8e9f70eb5d929c98b4379416c2259a74e31d587f
Reviewed-on: https://gerrit.libreoffice.org/3503
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24 05:18:15 +00:00
David Tardon
6c7659b584 move URE headers to include/
Change-Id: Ib48a12e902f2311c295b2007f08f44dee28f431d
Reviewed-on: https://gerrit.libreoffice.org/3499
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24 05:17:10 +00:00
Michael Stahl
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
Michael Stahl
288c8b9d59 adapt path for test.dll for WNT
Change-Id: I4d7cb081805213f55ae69c4ade8638bbfc06f0c4
2013-04-21 15:00:51 +02:00
Michael Stahl
b865ff3d75 python3: put an RPATH into python binary ...
... and get rid of LD_LIBRARY_PATH hack in wrapper shell script.

Change-Id: I7d91c6086460504d656de7b018087264165f396b
2013-04-19 16:16:34 +02:00
Michael Stahl
1fb53a6375 pyuno_loader::CreateInstance: delete the initial PyThreadState
Don't see how it could be used again, it appears to be leaked
and causes the assertion in PyThreadState_Swap to fire.

Change-Id: Id6bbb4363928e4fdd8bda1905f6e1f9931dba74c
Reviewed-on: https://gerrit.libreoffice.org/3452
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-04-18 16:27:16 +00:00
Miklos Vajna
89035356bc pyuno_dlopenwrapper: give error message before abort() if dlopen() fails
Change-Id: Idf39b33efe4c7838f2669aec8773616416811d57
2013-04-12 09:47:18 +02:00
Stephan Bergmann
4eccc3798b warning C4101: 'e' : unreferenced local variable
Change-Id: I2828021d60d82e43358ba98a1a3b4967a6901cd6
2013-04-09 12:33:56 +02:00
David Tardon
542cf6d9ea unbreak windows tinderbox
Change-Id: Ic777267cb86acdb62b53a7b324e1423b7c6b67c5
2013-04-09 09:46:38 +02:00
Michael Stahl
ebeae438db move Python tests in-process
This is nice to make them more easily debuggable.
A series of crude hacks are employed to bootstrap enough services from
python so the current tests run.
This is only tested with system python3 on Fedora.

Change-Id: I5e06741e55ead7fddec41ff776ff8ca5d2399469
Reviewed-on: https://gerrit.libreoffice.org/3215
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-04-09 05:52:49 +00:00
Luboš Luňák
1946794ae0 mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 14:23:11 +02:00
Chr. Rossmanith
8333cbf2a3 Remove RTL_CONSTASCII_(U)STRINGPARAM in pyuno
and use append() instead of appendAscii()

Change-Id: Iaf29a2f18eff39db5d1b5cc298cce23442ac51a9
2013-03-28 22:54:38 +01:00
Thomas Arnhold
39d45390f4 removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms

Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-03-19 10:48:30 +00:00
Thomas Arnhold
8b27d78b4a automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:

s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms

Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-03-19 09:00:26 +00:00
Luboš Luňák
a09124e6f5 avoid Wundef in cases where the usage seems otherwise ok
Change-Id: Iabccc31c59cec32235661f5225f45bb13f76a68f
2013-03-18 17:15:56 +01:00
Michael Meeks
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
Kenneth Beck
21e1e859a7 fdo#60724 change spelling error REMOVEABLE -> REMOVABLE
Only applies to PropertyAttribute::REMOVEABLE, and all instances in comments.
All other instances of the misspelling have remained the same.
Example: AF_REMOVEABLE

Change-Id: I391f4101bbc3e06689318235a37d616065bc1686
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-03-06 10:39:30 +01:00
Julien Nabet
76fb62755b coverity#983056: Resource leak
Change-Id: Ic40776f3cec5139e7f7accb4985533e78bd7c158
2013-03-04 21:27:27 +01:00
Michael Stahl
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
Michael Stahl
308cac3f23 sal: new ZipPackage_sal_odk_headers for public ODK headers
Change-Id: I76cb00121d7b4c21137be70ab7a5bd5389037302
2013-02-27 01:33:18 +01:00
Norbert Thiebaud
ed26c01be1 quiet external module build log unless failure
ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-22 08:25:56 +00:00
Julien Nabet
f68cd77923 Fix type unkown -> unknown
Change-Id: I8d55d5ae5ae38ae2b252859b5400e36301f19ef0
2013-02-21 21:50:01 +01:00
Jean-Noël Rouvignac
77fd448d09 Removed several useless macros: UNISTRING, USTR, USTR_ASCII, ASCII_STR, ASCII_STRING, CONST_ASCII, ASCSTR, ASCII, DEFINE_CONST_UNICODE, DEFINE_CONST_OUSTRING
Change-Id: I96d690bf9f9b319e9eeafcf218ec5ce87f21215f
Reviewed-on: https://gerrit.libreoffice.org/1954
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-02-14 13:20:14 +00:00
Stephan Bergmann
bd2c4e8dc4 Adapt PyUNO getConstantByName to previous TypeDescriptionMgr API CHANGE
Change-Id: I5a91c6c6dce103a8e4daa1572a638e1968a48fd8
2013-01-30 18:13:26 +01:00
Michael Stahl
5a61e28378 gbuild: fix silly "expandtabs" in makefile VIM modelines
Change-Id: I54d8923ad315e8041fd3904da3a29f1a7a8c8b16
2013-01-26 22:20:07 +01:00
Michael Stahl
a53586f4ef gbuild: do not copy boost headers around
- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus

Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
2013-01-26 22:20:06 +01:00
Stephan Bergmann
c2445b03f4 fdo#59728: Fix encoding of .py files as UTF-8 for Python 3
...where it could default to something like CP 1252 instead on Windows, while
keeping backwards compatibility for now with running under Python 2 (where
things apparently worked well with the original code).

Change-Id: I0ddd06771a36e1cd2cc2ce78abd8bd667db7778f
2013-01-23 17:58:25 +01:00
David Tardon
2e9ec0a8bc simplify processing of python.sh
Change-Id: I583407233fad1f7aaccc137642e5f134c3ba2874
2013-01-01 13:15:01 +01:00
David Tardon
085e0adf53 just pass the define through -D
I am constantly amazed at the creativity of the original makefile
writers. An extra header file, processed by sed, rather then adding one
item to CDEFS? Really?

Change-Id: I41ae8b10fc447ea5ab91e767c8afb87e39b9b5f5
2013-01-01 13:15:01 +01:00
Tor Lillqvist
d72a0b5c61 Check for __GNUC__ instead of GCC in sources
We still have checks for $(COM) being GCC or MSC in makefiles, of
course. But there is no reason to pass -D$(COM) to compilations.
Checking the built-in compiler-specific macros __GNUC__, _MSC_VER
(etc) is the right thing to do.

Change-Id: Ia961a29ba74e2c4977e5300a92318f38104c6592
2012-12-27 13:38:15 +02:00
Tor Lillqvist
c29098917a Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-25 17:53:25 +00:00
Tor Lillqvist
43df436f60 WaE: Fix needed with MSVS 2010, too
Change-Id: I1d1da64b14139c1d90ac07685f3fe88e99253815
2012-12-25 10:55:29 +02:00
Tor Lillqvist
781548472b VS2012 WaE: C4211: nonstandard extension used : redefined extern to static
Some screwup with hypot(). As a workaround, include <math.h> early.

Change-Id: Ic8c6abc45f8502097c6b6b619108d50ea3c22392
2012-12-21 18:39:28 +02:00
László Németh
71f9633d67 some not important Python3.3 port (pythonloader DEBUG mode)
Change-Id: I9a6ee04524c0ecd10301c17d2ca6da156d1c2160
2012-12-19 11:16:14 +01:00
Ariel Constenla-Haile
374c9af20d i118798 - Fix Pyuno dead-lock
Fixes fdo#57569, thanks to Miklós Prisznyák for the hint.

git-svn-id: https://svn-master.apache.org/repos/asf/incubator/ooo/trunk@1232123 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 19:40:50 +01:00
Julien Nabet
a0f86c9c1d Python/pep8: fix E711 (is or is not None instead of = or !=) in pyuno module
Change-Id: I8ee9abc9a31a6d7791a006ed589d83d5858de267
2012-12-09 23:16:08 +01:00
Michael Stahl
8f4ddb1910 pyuno: clean up that zipcore a little
That $(shell find...) is now entirely pointless with python3 in
tail_build; depend on package instead.

Change-Id: Iacc8a7d201f8ec2e41adf3e2351a755e955c0997
2012-12-02 21:52:23 +01:00
Peter Foley
921f31fb36 add python3 to tail_build
Change-Id: I01c3d280b4ff05ddbce77343ced6934b26bd3ceb
2012-11-30 11:34:30 -05:00
Michael Stahl
919263362c pyuno: add python_headers external and use it for wrapper
Change-Id: Ie151a1200037b6060eab00d6f0f0889134826e5e
2012-11-27 16:57:19 +01:00
Michael Stahl
9d921baa17 clean up PYTHON related version etc. variables:
- configure defines PYTHON_VERSION, PYTHON_VERSION_MAJOR,
  PYTHON_VERSION_MINOR
- remove pyversion.Makefile

Change-Id: I19ac8df18a520ad56bf63ea038dc0769b8249d0b
2012-11-27 16:57:19 +01:00
Michael Stahl
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
Michael Stahl
31170413ae API CHANGE: com.sun.star.lang.IllegalArgumentException
... derives from com.sun.star.uno.RuntimeException instead of
com.sun.star.uno.Exception.

Only test that breaks with this change is jurt_uno/AnyConverter_Test,
which for mysterious reasons effectively tests that
IllegalArgumentException is a subclass of Exception and not
RuntimeException.  Presumably this is just a generic exception test that
happens to use IllegalArgumentException.

Some further testing indicates there are no problems expected at
runtime:
Running "make subsequentcheck" with all Java test code compiled against
a ridl.jar that does not contain the change, running against a soffice
that uses ridl.jar and rdbs with the change + ridl.jar with the change
on the test side yields exactly the same AnyConverter_Test failure, with
no other failures.

Change-Id: Iad183de76ec7e0d56648084e97cdcc160b5b033d
2012-11-26 23:14:33 +01:00
Rene Engelhard
669f0da19b use correct PyString_Size for python2
This reverts commit 8ea4657f64e7575696be4bba5b2a4309ac029ae4.

Conflicts:
	pyuno/source/module/pyuno_util.cxx

Change-Id: I252688b72610864613ceb80aac9030062e63fdac
2012-11-26 13:48:58 +01:00
Julien Nabet
b7617d50dc New try to fix pystring size
I don't know if it's ok but compilation doesn't fail

Change-Id: I6960b2cd4587b3f49ccfa7fb24874c288ccfce6a
2012-11-25 19:05:01 +01:00
Michael Meeks
8ea4657f64 attempted blind fix for pystring size.
Change-Id: I637292be9791484a58b60e8889962176a37e2c07
2012-11-25 16:55:25 +00:00
Michael Stahl
af2b7fac27 pyuno: fix handling of "str", "unicode", "bytes" types:
Replace currrent wrappers of Python 2 only PyString_* functions with
better abstractions that handle default "str" (PyStr_*) or byte strings
("str"/"bytes" depending on version, PyStrBytes_*) and adjust all
invocations to work on appropriate string types.
Fixes obvious "attributes typeName and/or value of uno.Enum are not
strings" exceptions with Python 3.

Change-Id: I255dcb1bc198fd7f6a62b83b957901521071a480
2012-11-25 16:06:40 +01:00
Michael Stahl
a38b59265c pyuno: adjust uno.ByteSequence to work with "bytes"
This is necessary for Python3; "str" type is still accepted so it runs
on Python 2 as well.

Change-Id: I51098feca00e4cd8ce3ceebf663d4ce79252cbcd
2012-11-25 16:06:40 +01:00
Michael Stahl
8e5ea6dcbf pyuno: fix breakage because PATH_MAX not defined with Python3
Change-Id: I12e55c8810193591d9cd017bf5d89078b3915ddb
2012-11-17 00:45:12 +01:00