Commit Graph

170 Commits

Author SHA1 Message Date
Julien Nabet
e3e95f9763 Typo: embeded->embedded
Change-Id: I27d0cdac158a674274647fe0081a8d8c046fe0ea
2015-03-01 00:50:51 +01:00
Stephan Bergmann
827430c8c0 Fold URE: Windows
...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-03 15:19:55 +01:00
Stephan Bergmann
982f199a98 Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink

Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-12-01 15:10:32 +01:00
Stephan Bergmann
8fdb239735 Fold URE: Linux ure/share/java/* -> program/classes/
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28 15:32:26 +01:00
Stephan Bergmann
97b138980d Remove unused ure_unorc_url
...unused since 0c1dc375b4 "Make
ure/source/uretest/ use defaultBootstrap_InitialComponentContext"

Change-Id: I42385d2d92fb1e24376829ce5c7ae112ea771e51
2014-11-28 15:06:42 +01:00
Stephan Bergmann
45ca1bfc22 Fold URE: Linux ure/lib/* -> program/
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-28 11:57:28 +01:00
Stephan Bergmann
eef94c1655 Fold URE: Linux ure/bin/* -> program/
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
2014-11-28 11:57:28 +01:00
Stephan Bergmann
384aa260c8 theIntrospection missing from cppumaker call
Change-Id: Ia6d031f24f57cf37ab68934a4aef36a0797eee65
2014-11-28 10:23:59 +01:00
Stephan Bergmann
a55d4f6a60 ...so startup.sh is gone now
Change-Id: I667cd9db8a6f5511218d482fb97025480ddc2488
2014-11-24 15:45:47 +01:00
Stephan Bergmann
b7a81e33bc uno is the only remaining user of startup.sh
Change-Id: I0aa2f7384462777fc893aa282aea00aebd8dc664
2014-11-24 15:43:58 +01:00
Stephan Bergmann
2ceeee914e Remove jvmfwk plugin feature
...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-10-09 17:27:20 +02:00
Tor Lillqvist
332f6a5f99 The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mk
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-17 17:41:28 +03:00
Stephan Bergmann
d1a734cef0 Create instdir uno ini-file from instsetoo_native
...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-16 16:46:01 +02:00
Tor Lillqvist
e24d3ff2cd Use @LIBO_URE_LIB_FOLDER@ for URE_INTERNAL_LIB_DIR
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-10 10:08:33 +03:00
Tor Lillqvist
d83f28a250 Use @LIBO_URE_SHARE_JAVA_FOLDER@ instead of hardcoding ../share/java
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-08-10 10:08:31 +03:00
Noel Grandin
0e507ae031 various: remove SAL_THROW macro
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
2014-06-05 08:17:52 +02:00
Noel Grandin
e7bc3cab01 remove boilerplate in UNO Exception constructor calls
Now that we have default values for Exception constructor params,
remove lots of boilerplate code.

Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74
2014-05-23 15:06:00 +02:00
Stephan Bergmann
25cedf1dc7 Introduce com.sun.star.beans.theIntrospection singleton
...deprecating com.sun.star.beans.Introspection (single-instance) service.

Change-Id: Ica2e3a3541c7dcb1aab79222c5abf40d6988c882
2014-03-07 10:33:07 +01:00
Stephan Bergmann
a83b2af9ab Clean-up uno/lbnames.h
Change-Id: I4bd729499aa8be58f04194656e35c1f79d5d4919
2013-12-16 21:43:12 +01:00
Michael Stahl
ae5013c566 ure: remove documentation of no longer bundled GCC libraries
Change-Id: I28ca12157fcc918ccb8a87d1d1801908d300eca7
2013-12-11 13:38:52 +01:00
Michael Stahl
741b09c473 ure: remove references to SunStudio C52 filenames
Change-Id: If11655aa56239b9241db43a058244360a8abe1ec
2013-12-11 13:37:52 +01:00
Caolán McNamara
3656a57e88 add mode lines to new files (and idls) since last run
Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
2013-09-22 12:21:34 +01:00
Tor Lillqvist
a27d03a53b Remove incorrect comments
Change-Id: I3e9b82001f92edc6e697a976db635af31e16d769
2013-09-16 11:34:43 +03:00
Michael Stahl
9433b9074c tweak previous commit hoping it will work on Mac ...
... plus some more fixes:
- also install ure-link on WNT via Package not scp2.
- also disable unorc in scp2 on WNT, otherwise cannot built instset
  due to duplicate file.
- slso USE_INTERNAL_RIGHTS so startup.sh is executable.
2013-09-09 22:09:02 +02:00
Matúš Kukan
b45d2e7d14 ure: install files with filelists
This commit adds gb_Package_add_symbolic_link.

Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
2013-09-09 22:09:01 +02:00
Stephan Bergmann
644c33a857 fdo#67313: Use "lo" suffix for private URE libs
...(like is done for most of LO's non-URE libs already) to reduce likelihood of
name clashes, esp. on Windows where URE libs are found via PATH.

This introduces PRIVATELIBS_URE, and removes now-unused UNOLIBS_URE.

Change-Id: Ib95dd45f18de140a54e62d632dbf2239f83c232e
2013-08-27 14:03:36 +02:00
Tor Lillqvist
88960707cc Use correct paths to URE stuff on Windows
For some historical reason, URE has no "share" subfolder on Windows.

Change-Id: I530e673cc7a5cb5fe5d82a5e952ac50e4c2270b2
2013-08-19 00:34:22 +03:00
Tor Lillqvist
c6a7300974 Use subfolder names from <config_folders.h>
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-18 21:11:16 +03:00
Stephan Bergmann
99e94cdd65 Use new-style service ctors where possible
Change-Id: I36c62fc677de70c08d0d59e45debc6a86375d3b7
2013-04-29 15:08:48 +02:00
Stephan Bergmann
01c934acbe Check for theTypeDescriptionManager singleton
...rather than a TypeDescriptionManager service that is no longer available.

Change-Id: I1054ab0a658597a60d11e2f9aa0960df25d14bc4
2013-04-29 15:08:48 +02:00
Stephan Bergmann
0af9970da3 Mark TypeDescriptionProvider service as "don't create by name"
...had to adapt one test that had picked this service apparently arbitrarily.

Change-Id: Iaa17b7c622b9ac3601beb3ba931f7b1d99f649f1
2013-04-25 17:45:35 +02:00
Stephan Bergmann
5051209534 Adapt SDK to usage of msvcrtd for Windows --enable-dbgutil
* Re-use existing settings/dk.mk to tunnel ENABLE_DEBUG into the SDK.  Turns out
  this was explicitly included in ~all examples Makefiles, but only after
  settings.mk where it is now used, so include it in settings.mk now and dropped
  it from all the exmaples Makefiles.

* The old settings.mk was apparently confused with using /MT ("link with
  LIBCMT.LIB") on cl command line and /MD ("link with MSVCRT.LIB") on link
  command line (where it was ignored), and you apparently can't pass both
  together to cl, so I settled on /MD (resp. /MDd) now and dropped /MT (resp.
  /MTd).  No idea if that is exactly right, however.

* Introduced client-facing LIBO_SDK_LDFLAGS_STDLIBS that covers kernel32.lib and
  msvcrt.lib vs. msvcrtd.lib on Windows.  Adapted examples Makefiles and
  /ure/source/uretest/Makefile accordingly.  Some examples Makefiles
  additionally use msvcprt.lib, no idea whether that still needs to be
  addressed.

Change-Id: Ia8d9d177e415abfbaf6f9fa6239f0ef9998868be
2013-04-19 14:02:18 +02:00
Stephan Bergmann
1974692316 Adapt env var settings to MS command shell syntax
Change-Id: Ie6d761a436a3c1b06f0da1dac7c93c50789230dd
2013-04-18 13:57:15 +02:00
Stephan Bergmann
b9d93c0030 Adapt uretest to -B removed from cppumaker/javamaker
Change-Id: If256eeddf4b8efded6e5e010b0155e05f5a1de79
2013-04-11 14:24:08 +02:00
Stephan Bergmann
c482ded5fd Let theMacroExpander.hpp take care about the singleton instantiation details
Change-Id: I8e919291cb4c8fc223ca7143e860a2a0b44cb930
2013-04-11 14:24:07 +02:00
Stephan Bergmann
0ea1711e98 Missing rtl:: namespace
Change-Id: I6088dc1c9d9afaa031231ea0c9f104a92ce41658
2013-04-11 14:24:07 +02:00
Thomas Arnhold
a808497dbb drop prefix from ::css
as css is already ::com::sun::star

Change-Id: I86b43843e4b74f990b6e05dee37184a002072d12
2013-04-02 09:01:37 +02:00
Chr. Rossmanith
ccce843ab6 Removed RTL_CONSTASCII_USTRINGPARAM in xmlhelp/ure
Change-Id: Ibaf83366e79292bbb6756045e4c82f2650958150
2013-03-10 07:52:58 +01:00
Stephan Bergmann
320571bf70 WIP: Experimental new binary type.rdb format
Move unoidl functionality into a module of its own, as a prerequisite to use it
in codemaker etc.  (This is intended to ultimately remove modules store and
registry, modulo backwards compatibility constraints.)

Change-Id: If5274cbd3a595951e6cf7a9664bc542f01833f38
2013-02-25 16:24:44 +01:00
Chr. Rossmanith
ed383ebfba remove RTL_CONSTASCII_(U)STRINGPARAM
Change-Id: Ica4dc859229c2ba0dc052a97ff23178895c25580
Reviewed-on: https://gerrit.libreoffice.org/2368
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
2013-02-24 21:16:12 +00:00
Stephan Bergmann
0c1dc375b4 Make ure/source/uretest/ use defaultBootstrap_InitialComponentContext
...instead of the ure executable's obsolte -ro arguments (leading to usage of
deprecated bootstrap_InitialComponentContext with an XSimpleRegistry instead).

The com.sun.star.lang.MultiServiceFactory service is (only) implemented by the
cppuhelper/source/defaultbootstrap.cxx ServiceManager itself, but it doesn't add
itself to its list of know services, so cppmain.cc should not test for it.

Change-Id: Iaaf8d466fe3607ab9bac6aba09396809e53404f3
2012-12-19 09:55:30 +01:00
Stephan Bergmann
b7215602c0 API CHANGE: Remove obsolete regcomp from URE
Change-Id: Iaec5e0fd53d340f028e271f28e99a73dedc636f7
2012-12-18 16:23:24 +01:00
Stephan Bergmann
b980eca67e Adapt ure/source/uretest/ to passive component registration
(regview only works for old binary .rdb files, so test-regview needs to use
types.rdb now)

Change-Id: Icd68122c08ae723010c42a8515e09c2d81f0cdda
2012-12-18 16:23:23 +01:00
Stephan Bergmann
7068cad924 -fvisibility=hidden requires HAVE_GCC_VISIBILITY_FEATURE
...had been forgotten in f983798164 "Make
ure/source/uretest work again"

Change-Id: I9175118126124eba4ea750914d588f6c1ccb2604
2012-12-18 16:23:23 +01:00
Stephan Bergmann
39da5cf133 SDK's include/stl is long gone
...since 1628005298 "Trying to remove the stlport
mention from the code"

Change-Id: I8785274bc2fdc9d97200aea245e1e8182249cde6
2012-12-18 12:47:39 +01:00
Stephan Bergmann
77d3777c89 Remove --with-stlport from LO 4.0
The STLport was only built for the benefit of old extensions on platforms that
once used it themselves (Linux x86, Solaris x86 and SPARC, Windows).  We
deliberately break such old extensions for LO 4.0 by no longer shipping that
backwards-compatiblity cludge.

Keeps STLport listed in readlicense_oo/ because of
o3tl/inc/o3tl/compat_functionality.hxx.

Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?).

Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from
l10ntools/inc/helpmerge.hxx that was once added with
8548125848 "INTEGRATION: CWS extensionl10nfix01
(1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename
-> MoveFileEx" but now starts to cause trouble on Windows.  Also disables
warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both
tools/wintypes.hxx and the Windows API) in a number of places that include
windows.h -- however the old STLport caused those warnings to not show.

Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829
2012-12-17 16:34:23 +01:00
Thorsten Behrens
66a175834c c++ API: use css alias in generated headers, adds global css decl
This changes all generated API headers (.hpp and .hdl) to use a
namespace alias 'css' instead of the pointlessly long com::sun::star

Makes the change in cppumaker & associated tools, adds a global
namespace alias definition in sal/types.h, and removes a kiloton
of local, now pointless-to-harmful versions of that alias from all
over the code.

Change-Id: Ice5a644a6b971a981f01dc0589d48f5add31cc0f
2012-11-30 14:36:36 +01:00
Stephan Bergmann
b699519969 Drop support for /etc/opt/ure and ~/.ure from LibreOffice 4
For one, /etc/opt/ure was probably never used by anyone anyway, so meant just
needless file-stats during startup.  For another, accidentally created
~/.ure/javasettings_*.xml that later became stale were noted to cause trouble,
so that source is now closed.

For this to work, jvmfwk needs to be silent now if it cannot read/write any
shared/user javasettings_*.xml.

Change-Id: I332b5ebb9549dc6ccf7c99c439d9a3b61aeb5829
2012-11-15 12:46:19 +01:00
Stephan Bergmann
543158edba Require XComponentContext.getServiceManager to throw instead of returning null
This is such a fatal error that there is probably no point in trying to handle
it, so allow to simplify client code by removing the requirement to check for a
null return value.

Simplified some client code accordingly (modules configmgr and ure, and the code
generated by cppumaker and javamaker).

Change-Id: I51c0b270ec73409374f7439a47ee061407a46e31
2012-09-17 16:59:53 +02:00
Stephan Bergmann
f983798164 Make ure/source/uretest work again
...at least, Makefile (to be run from within an SDK environment) works again; I
reflected all the relevant changes in Makefile.pln (to be run from no specific
environment) too, but did not actually check the latter

Change-Id: Ie2012d26b3bd59335a0f872bbfc1414cc4f5edc5
2012-08-08 18:36:39 +02:00