summaryrefslogtreecommitdiff
path: root/pyuno
AgeCommit message (Collapse)Author
2013-10-10sal: add special handling of argc==0 to osl_setCommandArgs()Michael Stahl
... to set up a fake command line. This is used from pyuno, when invoked from the "python" executable as "import uno". On WNT there is an API to get the actual command line, so just use that even in the "fake" case; on UNX just fake something up. Just for the record the whole osl_setCommandArgs() is called exactly once assumption should work out _unless_ there is a program that uses SAL_MAIN _and_ does a python-level "import uno" _before_ it wants to create a python-based UNO service (via pyuno_loader::CreateInstance), since pyuno already takes care to call Runtime::initialize() at most once. Change-Id: Ifd23de733ea3e6b694d46ab039b6aa4fd3e7fc1b Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-09pyuno: set up fake command line in getComponentContext()Michael Stahl
Easy to trigger the assert in osl_getCommandArgCount(), just run instdir/*/program/python and "import unohelper". Avoid that by setting up a fake command line, hopefully nobody expects to be able to give relevant args to python... Change-Id: I0df6c23d6ecbb3c2bce81a9d5bcecdcb1729ddbb
2013-10-07fdo#70196: Python 2 compatibility for UNO import error handlingDavid Bolen
Add backwards compatibility support for Python 2 to the earlier change in fdo#66025 to improve import error handling under Python 3. Change-Id: I47bf8ef255c4c2a3e4a2754414977aaa8ed32483 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-02WaE: unused variableTor Lillqvist
Change-Id: Iea8461444c29de9968a5bfa85a2dabb186db47ca
2013-09-25Start hacking --enable-canonical-installation-tree-structure back into shapeTor Lillqvist
Had been totaly broken by the recent changes. (Which is fine, it is just an experimental hack anyway, I am not sure whether it will ever be used in anger. Just a pet peeve of mine, I dislike seeing libraries, configuration files, resources etc mixed together in one "program" folder, especially on OS X, where the convention is to have app-specific dylibs and frameworks in "Frameworks", and resource files in "Resources". But this is not any requirement as such; there are apps in the Mac App Store that blatantly "break" this convention.) Basically, replace uses of gb_PROGRAMDIRNAME and gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which for normal builds all expand to the same "program" anyway. Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
2013-09-23Try to fix cross-compilationTor Lillqvist
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions. Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT. Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
2013-09-22pyuno: rename the python wrapper executableMichael Stahl
Putting it in a subdirectory on solver is no longer necessary since python3 started delivering to INSTDIR, so lose the crazy naming. Change-Id: I17e924e5d872768a64f6a3112f1294f3def7120e
2013-09-22gbuild: remove libraries from OUTDIR and WORKDIRMichael Stahl
Refactor everything to find and link libraries directly in INSTDIR. - add gb_LinkTarget_get_linksearchpath_for_layer, and use it to set up -L paths for T_LDFLAGS in such a way that only allowed libraries can be linked against; i.e. it's not possible to link URE linktargets against OOO or not-installed libraries - gb_Library_get_target is now same as the gb_LinkTarget_get_target (TODO: this needs cleanup) - since a pattern rule won't work for linking libraries in INSTDIR, add a separate per-file rule for every INSTDIR lib - pattern rule can't find link target in the clean target any more so add a LINKTARGET variable - disable gb_Library_add_auxtarget, no auxtargets need to be copied - tweak the call to gb_Library_Library_platform to pass in a path in sdk/lib for the versioned URE libs - fix the Library clean target - add LAYER parameter to gb_LinkTarget_LinkTarget - adjust platform link commands - MSVC link command now uses explicit -manifestfile and -pdb parameters to keep misc. files out of INSTDIR - remove gb_Helper_OUTDIR_FOR_BUILDLIBDIR - adjust Extension, CppunitTest, JunitTest, PythonTest, Gallery, various CustomTargets to search INSTDIR - remove SDK library symlinks and import libs from odk/Package_lib - on Mac OS X, put .dylib symlinks into sdk/lib even though those are not packaged and would be created by the SDK configury; we need these to be somewhere for linking anyway - add a (unfortunately cyclic) dependency on Package ure_install to sal Change-Id: I70d88742f8c8232ad7b9521416275c67b64fe6cf
2013-09-12gbuild: remove gb_Rdb__get_final_targetMichael Stahl
... by replacing gb_Rdb_install with a separate constructor so the right target can be registered at the module. There is still an ugly special case for the ure/services. Change-Id: I81c004143f201aaf38daca99819888313ee24f49
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-09gbuild: install rdb files directly in module they come fromMatúš Kukan
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
2013-09-09pyuno: another filelist to make instdir betterMatúš Kukan
Change-Id: Ieda9b3847de3de8989eaafc542e60216baa1af4d
2013-09-09pyuno: this rc file seems to be unusedMatúš Kukan
Change-Id: I98b6263a464b46075e69e363c3eb9e4ec4557c46
2013-09-09pyuno: install python scripts using filelistsMatúš Kukan
Change-Id: Ic7515acd14916cc36b59749059ed623cda906c23
2013-08-30ENABLE_MACOSX_MACLIKE* Harmonize ENABLE_* variable to TRUE/<nothing>Norbert Thiebaud
Change-Id: I0c51975c1c13dbd100bbd8e6103835ce8a8c3691
2013-08-21finish deprecation of O(U)String::valueOf()Luboš Luňák
Compiler plugin to replace with matching number(), boolean() or OUString ctor, ran it, few manual tweaks, mark as really deprecated. Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
2013-08-21osl_getThreadIdentifier(0) -> osl::Thread::getCurrentIdentifier()Stephan Bergmann
Change-Id: Ida9785c4b9fda0459769957734952e69d7a9de44
2013-08-18Further work on the "Mac-like app structure" optionTor Lillqvist
Lots of stuff still either ended up in the wrong place, or was looked up from the wrong place, or both. Fix most cases. Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
2013-08-18Use subfolder names from <config_folders.h>Tor Lillqvist
Change all instances of hardcoded "program", "share" etc subfolder names to use those from <config_folders.h> instead. In normal builds, the end result will not change. Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
2013-08-15Mark as constTakeshi Abe
Change-Id: Ic7ee570935b5d827dc01a483877ea5021da5abea
2013-08-13fdo#50470: Restore pyuno object method introspection in Python 3David Bolen
Switch to __dir__ entry point for introspection as Python 3 dropped support for __members__/__methods__. This is backwards compatible to Python 2.6. Module initialization adjusted to complete type setup (needed for tp_dict) via PyType_Ready. Change-Id: Ie1f7b9dd4279242de89d009eb7acdc8c786dab8f Reviewed-on: https://gerrit.libreoffice.org/5375 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-29Remove whitespace from line endsStephan Bergmann
Change-Id: Ie894879eaebda32bc4f99e7ad7f810c569e86a7a
2013-07-29fdo#66025: Improve accuracy of ImportError traceback and messageDavid Bolen
The ImportError raised on an import failure with the uno module loaded now includes a complete traceback and the original Python exception message text, combined with the most relevant (nearest to failure if imports are nested) uno lookup that also failed. Change-Id: Id968d84d7f09d555a81017a99369beb503d61439 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-24fdo#66025: Simplify new ImportError logicDavid Bolen
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-24fdo#66025: Minor clean-up of previous patchDavid Bolen
Change-Id: Idaaf8ebbf419899ba04b77cf10b217c141652a3a Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-24fdo#66025: Improve ImportError raised from _uno_importDavid Bolen
Change-Id: I92301f0c37d69e5977a12ab4d5a360f7a4ff20fe Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-17remove last users of gb_Executable_add_noexception_objectBjoern Michaelsen
Change-Id: Iddee238aa800ecfee8f97a7132b38b6446e0b2a4 Reviewed-on: https://gerrit.libreoffice.org/4953 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-07-12Resolves: #i120788# remove unused members from PyUNO_callable_InternalsHerbert Dürr
Patch by: Tsutomu Uchino <hanya.runo@gmail.com> (cherry picked from commit 5e2c3fd88906494965979bd20ca852391bee3bac) Conflicts: pyuno/source/module/pyuno_impl.hxx Change-Id: If73d5f7b799f04b79b5cc71d2d44c797851b18d0
2013-07-08pyuno: Revert 5589c72b88e502bfca045ae38af16c854afdd401Michael Stahl
... which was obsoleted by commit c007292ec3eedcf2b1ad673308fa42aad31a7333 and apparently causes breakage for builds with gb_GCOV=YES. Change-Id: I27def9a8b4d003bf82c84e55d36ace37dd8532b0
2013-06-29remove OUString wrap for string literalsThomas Arnhold
For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-06-29reduce some spacingThomas Arnhold
Change-Id: I72d494b1c0ff5ed3c52ae6a078815f497e4dd647
2013-06-16PyUno fixed crash in function isInstanceOfStructOrException()Xiaoli
when we try to call PyUNO_callable object that doesn't have __class__ attribute Change-Id: Ia05f70d70f248d50aa141b09625f7ec50189e1dd Reviewed-on: https://gerrit.libreoffice.org/4309 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-06-10Deprecated conversion from const wchar_t* to wchar_t*Fridrich Štrba
Change-Id: I8c0a97372f0855543d6207adb0abaa4cc820aabd
2013-05-28Optional pyuno module should have its own services/pyuno.rdbStephan Bergmann
...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-14fdo#46808, Convert script::InvocationAdapterFactory to new styleNoel Grandin
Change-Id: I2fe24c863f4c43471f46032ed15fcd5b98863fc1
2013-05-14pyuno: remove obsolete makefilesMichael Stahl
These should have been removed in b6bcbb675afedba0c47654dd78dc446dac0630d1 Change-Id: Iec28da16542f16c459bf301649260d8b13c1c67d
2013-05-10More gb_PROGRAMDIRNAME clean upStephan Bergmann
Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9
2013-05-08No need for RTLD_NOW hereStephan Bergmann
...it was like that "since the beginning," but for no apparent reason. Change-Id: Ic293739b5cd5de0bfe9e2580a0755af64202e582
2013-05-08Library_puyuno_wrapper is not built on WNT anywayStephan Bergmann
Change-Id: Ia4e2f9d5f3475b0a7af8b6db80ba4b2cd5f6bfce
2013-05-08Make sure again pyuno_wrapper does not link against libstdc++Stephan Bergmann
...which got broken with gbuild'ification. Change-Id: Ice2b3ffb81a646c9e542344ca348eb6a16eb4ce2
2013-05-05copy pyuno files to instdirDavid Tardon
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
2013-04-30Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks
2013-04-24gbuild: drop empty use_packages callsDavid Tardon
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-24move URE headers to include/David Tardon
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-22replace python-core zip built in pyuno with direct use of PackageMichael Stahl
- 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-21adapt path for test.dll for WNTMichael Stahl
Change-Id: I4d7cb081805213f55ae69c4ade8638bbfc06f0c4
2013-04-19python3: put an RPATH into python binary ...Michael Stahl
... and get rid of LD_LIBRARY_PATH hack in wrapper shell script. Change-Id: I7d91c6086460504d656de7b018087264165f396b
2013-04-18pyuno_loader::CreateInstance: delete the initial PyThreadStateMichael Stahl
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-12pyuno_dlopenwrapper: give error message before abort() if dlopen() failsMiklos Vajna
Change-Id: Idf39b33efe4c7838f2669aec8773616416811d57
2013-04-09warning C4101: 'e' : unreferenced local variableStephan Bergmann
Change-Id: I2828021d60d82e43358ba98a1a3b4967a6901cd6
generated by cgit (git 2.34.1) at 2025-01-15 06:10:39 +0000