summaryrefslogtreecommitdiff
path: root/ure
AgeCommit message (Collapse)AuthorFilesLines
2020-05-06Move all public Java classes to libreoffice.jarSamuel Mehrbrodt2-13/+15
This moves the classes from juh.jar and ridl.jar to libreoffice.jar The goal is to have one single jar (and Java module, will be added later) which developers can include to work with LO. juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar on its classpath to keep backwards compatibility. This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d and a preparation to have Java 9 module support. Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-04tdf#117331 Merge jurt and unoil into ridlSamuel Mehrbrodt2-4/+6
jurt.jar and unoil.jar are kept as effectively empty jars, each with a Class-Path: ridl.jar in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or without also loading ridl.jar) will still have access to their content. Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi) are not part of the URE, but are now made available by URE's ridl.jar. This should probably not cause problems in practice. At least for now, we seal exactly those packages in ridl.jar that were originally sealed in jurt.jar. Ideally, all of ridl.jar could be sealed now, but that would be mildly incompatible, as it would prevent 3rd-party code from introducing additional UNOIDL entities in the relevant namespaces (even if that is something we do not want 3rd-party code to do anyway). However, some JunitTest_jurt_* define classes in those sealed packages. In the past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt. Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the gb_JunitTest_use_jar,*,ridl. But the former only makes available the classes that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the UNOIDL entities specified via gb_Jar_add_packagedirs. But the tests need the udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests get them explicitly. (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets leave that for a follow-up clean up.) As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/. Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a Co-authored-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-24remove more rtl::OUString and OString prefixesNoel Grandin3-26/+26
which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-04-09Remove std::bad_alloc -> css::uno::RuntimeException mappingsStephan Bergmann3-20/+3
...that are no longer needed now that the dynamic exception specifications are gone from C++ UNO, so won't cause std::unexpected any more. Change-Id: Ie3418658f5a84e6cec1ac48e3413f523f87497fe Reviewed-on: https://gerrit.libreoffice.org/52641 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-05-30Fix quotingStephan Bergmann1-1/+1
...broken with 6c80b3730ebe5a95aa685e5f02c285edeb21d4a5 "tdf#105204 fix shellcheck warnings in ure/source/uno" Change-Id: I44a6239d47353aea84ff4ab6d597104bd96e0950
2017-05-20tdf#105204 fix shellcheck warnings in ure/source/unoYeliz Taneroğlu1-3/+3
Use $(..) instead of `..`, double quote to prevent word splitting. Change-Id: I80251d98e6fb27af5a18c202521050c8101131fa Reviewed-on: https://gerrit.libreoffice.org/37465 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2017-01-27Remove dynamic exception specifications from !LIBO_INTERNAL_ONLYStephan Bergmann3-11/+4
...only odk/examples/ remains to be clean up Change-Id: I875a1e8d6750b6b007bd75126b8010273e1f32d5
2017-01-26ure/source/uretest is !LIBO_INTERNAL_ONLYStephan Bergmann3-6/+6
...so revert the relevant parts of d1a9c73ea16f5b4838f639ce2bb2226d9b9b334a "tdf#88206 replace cppu::WeakImplHelper* misc" Change-Id: I0ee5bf227fc541672dfb73e57657640cbccbf7f3
2017-01-18update approximate install location in READMECaolán McNamara3-62/+62
Change-Id: I6a139d5be193c968c2bf3373b415baa25dc32595
2016-12-07tdf#88206 replace cppu::WeakImplHelper* miscJochen Nitschke3-6/+6
also edited two examples in canvas comments Change-Id: Iac82b462168f869f995c33bb2c639f3dbe09cbd5 Reviewed-on: https://gerrit.libreoffice.org/31715 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-20[API CHANGE] Remove HAVE_GCC_VISIBILITY_FEATURE, always trueStephan Bergmann1-6/+3
* GCC documents -fvisibility at least as far back as the GCC 4.0 online documentation at <https://gcc.gnu.org/onlinedocs/gcc-4.0.4/gcc/Code-Gen-Options.html>. * For external code, odk/settings/settings.mk unconditionally set HAVE_GCC_VISIBILITY_FEATURE for all platforms other than Windows. Make this a fatal configure error for now. The check should be removed completely after LO 5.3 branch-off. Change-Id: I1de415b6ed1591e0a7b6640ece861b6f0ef74112 Reviewed-on: https://gerrit.libreoffice.org/29073 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-03-04Don't put symlink to MacOS folder of sandboxed appAndras Timar1-0/+2
Conflicts: ure/Package_install.mk Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a (cherry picked from commit d6785e162fa8cc4b03de76cd2d089d62ae45c068)
2015-09-15Revert cppuhelper/implbase.hxx usage in non-LIBO_INTERNAL_ONLY code, againStephan Bergmann3-6/+6
Change-Id: I8c40f4ea79941e7ca5438ff9756f62988719cebc
2015-09-15Resolves: tdf#88206 replace cppu::WeakImplHelper* etc.Takeshi Abe3-6/+6
with the variadic variants. Change-Id: I7154f9472f02fdf47d27ba715db55bb1ec669a8a Reviewed-on: https://gerrit.libreoffice.org/18580 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-03-01Typo: embeded->embeddedJulien Nabet1-1/+1
Change-Id: I27d0cdac158a674274647fe0081a8d8c046fe0ea
2014-12-03Fold URE: WindowsStephan Bergmann2-3/+0
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is no longer necessary and loading of cppuhelper from the program dir cannot fail regardless in whatever scenario the cli_cppuhelper library itself is loaded. Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
2014-12-01Fold URE: Linux ure/share/misc/* -> program/Stephan Bergmann3-8/+4
...and remove now unused ure-link symlink Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-11-28Fold URE: Linux ure/share/java/* -> program/classes/Stephan Bergmann1-10/+9
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28Remove unused ure_unorc_urlStephan Bergmann1-2/+0
...unused since 0c1dc375b4bf0c8ff01fe51921767faa703b1295 "Make ure/source/uretest/ use defaultBootstrap_InitialComponentContext" Change-Id: I42385d2d92fb1e24376829ce5c7ae112ea771e51
2014-11-28Fold URE: Linux ure/lib/* -> program/Stephan Bergmann4-40/+9
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge (and juh.jar had lacked adaption for Mac OS X). Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
2014-11-28Fold URE: Linux ure/bin/* -> program/Stephan Bergmann2-30/+34
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
2014-11-28theIntrospection missing from cppumaker callStephan Bergmann2-2/+2
Change-Id: Ia6d031f24f57cf37ab68934a4aef36a0797eee65
2014-11-24...so startup.sh is gone nowStephan Bergmann1-1/+0
Change-Id: I667cd9db8a6f5511218d482fb97025480ddc2488
2014-11-24uno is the only remaining user of startup.shStephan Bergmann2-2/+1
Change-Id: I0aa2f7384462777fc893aa282aea00aebd8dc664
2014-10-09Remove jvmfwk plugin featureStephan Bergmann1-2/+0
...which was effectively unused; there only ever was a single sunjavaplugin that is now folded directly into jvmfwk. Leaves room for further clean up. Change-Id: I14dd2a3a09bd1ce9a8c3f5c156628ec11d954a0b
2014-09-17The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mkTor Lillqvist3-42/+0
So no need to expand it at configure time in ure/source/unorc, and no need to handle the related builddir!=srcdir complications. Change-Id: Ifa34d25fab9ad2da13ed039bf6c5921b0fb58703
2014-09-16urelibs is part of the stable extension interface on Mac OS XStephan Bergmann1-1/+1
Change-Id: Id1f089b9306124e43a4e44cdd2efccb5f60761d5
2014-09-16Create instdir uno ini-file from instsetoo_nativeStephan Bergmann3-24/+2
...like is done for most other ini-files too, with entries indentical to the ones in scp2/source/ooo/ure.scp. (And sort ini-files lexicographically again in instsetoo_native/*.mk, broken with recent louno rename). Leave ure/source/unorc.in and ure/Pacakge_builddir_install.mk around for the cross-compilation case only. Change-Id: Ic07e036ef126db1aee2c0f6b726c2b86c2536c53
2014-09-09Make the "Mac-like" or "canonical" app bundle structure always used on OS XTor Lillqvist1-3/+1
In other words, only executable files go in the MacOS folder. Dynamic libraries and bundled frameworks (i.e., LibreOfficePython), and nothing else, go in the Frameworks folder, and all other files go in the Resources folder. Especially, note that Java class files and rc (.ini) files also go in Resources. Such an app bundle structure is what Apple strongly suggests one should use, and it has been hinted that future versions of code signing and/or Gatekeeper will require such a structure. There is still some ugliness thanks to traces of the historical separation of URE from "the office". Like there are two separate "unorc" files, one for URE, one for the LibreOffice application. IMHO, this should be cleaned up, but is probably controversial. (Eek! I now see there are actually *three* unorc files in the app bundle. Not intentional. Need to fix that later.) Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
2014-08-10Ugly hack to fix build when srcdir!=builddirTor Lillqvist3-1/+18
The problem is that the ure/source/unorc file is now expanded by the configure script, and thus exists only in builddir. But a further complication is that the uno.ini file is in srcdir. This is one way to handle it. Seems to work for me, let's see what the srcdir!=builddir tinderbox slaves say. Change-Id: I6fb456cf849ce5077e2c5bd25dc9149096aab241
2014-08-10javaldx is not built for WNT or MACOSX so no point in the uno wrapper scriptTor Lillqvist1-1/+1
Change-Id: I127205ebf6fb3fe01de6803a989e970f46df22bb
2014-08-10Fixes for the --enable-canonical-installation-tree-structure caseTor Lillqvist1-2/+0
Do install the uno and startup.sh commands, smoketest needs them Change-Id: Ia530564e4b664881d730355a80e2af4476987e10
2014-08-10Use @LIBO_URE_LIB_FOLDER@ for URE_INTERNAL_LIB_DIRTor Lillqvist1-1/+1
In the --enable-canonical-installation-tree-structure case (on OS X), the URE unorc is definitely not in the same place as any libs. Noticed in JunitTest_comphelper_complex. Change-Id: Ic6097021f9abc081e2a7c7aac25286ad2c4b75e5
2014-08-10Use @LIBO_URE_SHARE_JAVA_FOLDER@ instead of hardcoding ../share/javaTor Lillqvist1-1/+1
Makes CppunitTest_dbaccess_hsqldb_test work also in the --enable-canonical-installation-tree-structure (on OS X), otherwise the use of $URE_INTERNAL_JAVA_CLASSPATH (looked up from the URE unorc) in stoc/source/javavm/javavm.cxx fails. Change-Id: I5ea045594c32e6a1398b73cff1e4aa8bbe1aa265
2014-06-05various: remove SAL_THROW macroNoel Grandin3-3/+0
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
2014-05-23remove boilerplate in UNO Exception constructor callsNoel Grandin3-9/+3
Now that we have default values for Exception constructor params, remove lots of boilerplate code. Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74
2014-03-07Introduce com.sun.star.beans.theIntrospection singletonStephan Bergmann1-0/+2
...deprecating com.sun.star.beans.Introspection (single-instance) service. Change-Id: Ica2e3a3541c7dcb1aab79222c5abf40d6988c882
2013-12-16Clean-up uno/lbnames.hStephan Bergmann3-3/+0
Change-Id: I4bd729499aa8be58f04194656e35c1f79d5d4919
2013-12-11ure: remove documentation of no longer bundled GCC librariesMichael Stahl1-13/+0
Change-Id: I28ca12157fcc918ccb8a87d1d1801908d300eca7
2013-12-11ure: remove references to SunStudio C52 filenamesMichael Stahl1-17/+13
Change-Id: If11655aa56239b9241db43a058244360a8abe1ec
2013-11-05fdo#60698: Merge all libs of io...Marcos Paulo de Souza1-6/+1
creating the libio. All these libraries are always used together, so we can put them together in one single library. This save almost 500 kb of the size of the final library. Change-Id: Ib32fec36cc4eb80ca646ce472c1f1bcdd98ac62b Reviewed-on: https://gerrit.libreoffice.org/6567 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl1-2/+0
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-05URE folder path fixes for the HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE caseTor Lillqvist1-1/+1
Change-Id: I5019cce2172db7b3ac74e25f5ea9dc62e9fd03f8
2013-09-23Try to fix cross-compilationTor Lillqvist1-1/+1
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-22add mode lines to new files (and idls) since last runCaolán McNamara1-0/+3
Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
2013-09-16Remove incorrect commentsTor Lillqvist2-10/+0
Change-Id: I3e9b82001f92edc6e697a976db635af31e16d769
2013-09-12gbuild: remove gb_Rdb__get_final_targetMichael Stahl1-3/+1
... 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 X: some LIBO_URE_BIN_FOLDER fixesStephan Bergmann1-2/+2
Change-Id: I0583136acd5d92101ad1a23392735ed76581c0b8
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann1-2/+2
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úš Kukan1-0/+2
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 12:28:41 +0000