Age | Commit message (Collapse) | Author |
|
Conflicts:
ure/Package_install.mk
Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
(cherry picked from commit d6785e162fa8cc4b03de76cd2d089d62ae45c068)
|
|
Change-Id: I8c40f4ea79941e7ca5438ff9756f62988719cebc
|
|
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>
|
|
Change-Id: I27d0cdac158a674274647fe0081a8d8c046fe0ea
|
|
...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
|
|
...and remove now unused ure-link symlink
Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
|
|
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
|
|
...unused since 0c1dc375b4bf0c8ff01fe51921767faa703b1295 "Make
ure/source/uretest/ use defaultBootstrap_InitialComponentContext"
Change-Id: I42385d2d92fb1e24376829ce5c7ae112ea771e51
|
|
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
|
|
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
|
|
Change-Id: Ia6d031f24f57cf37ab68934a4aef36a0797eee65
|
|
Change-Id: I667cd9db8a6f5511218d482fb97025480ddc2488
|
|
Change-Id: I0aa2f7384462777fc893aa282aea00aebd8dc664
|
|
...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
|
|
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
|
|
Change-Id: Id1f089b9306124e43a4e44cdd2efccb5f60761d5
|
|
...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
|
|
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
|
|
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
|
|
Change-Id: I127205ebf6fb3fe01de6803a989e970f46df22bb
|
|
Do install the uno and startup.sh commands, smoketest needs them
Change-Id: Ia530564e4b664881d730355a80e2af4476987e10
|
|
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
|
|
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
|
|
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
|
|
Now that we have default values for Exception constructor params,
remove lots of boilerplate code.
Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74
|
|
...deprecating com.sun.star.beans.Introspection (single-instance) service.
Change-Id: Ica2e3a3541c7dcb1aab79222c5abf40d6988c882
|
|
Change-Id: I4bd729499aa8be58f04194656e35c1f79d5d4919
|
|
Change-Id: I28ca12157fcc918ccb8a87d1d1801908d300eca7
|
|
Change-Id: If11655aa56239b9241db43a058244360a8abe1ec
|
|
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>
|
|
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
|
|
Change-Id: I5019cce2172db7b3ac74e25f5ea9dc62e9fd03f8
|
|
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
|
|
Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
|
|
Change-Id: I3e9b82001f92edc6e697a976db635af31e16d769
|
|
... 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
|
|
Change-Id: I0583136acd5d92101ad1a23392735ed76581c0b8
|
|
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
|
|
Change-Id: I3a9cb4ce71cfb02b7378289a36aa0eb6e3a42f26
|
|
... 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.
|
|
This commit adds gb_Package_add_symbolic_link.
Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
|
|
...(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
|
|
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
|
|
For some historical reason, URE has no "share" subfolder on Windows.
Change-Id: I530e673cc7a5cb5fe5d82a5e952ac50e4c2270b2
|
|
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
|
|
...into a new smoketest.jar, so that URE juh.jar no longer depends on non-URE
unoil.jar.
Change-Id: I8937c78d8af6e2f82ada5dd80c322f8bca5ec2f5
|
|
Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32
|
|
Change-Id: I36c62fc677de70c08d0d59e45debc6a86375d3b7
|
|
...rather than a TypeDescriptionManager service that is no longer available.
Change-Id: I1054ab0a658597a60d11e2f9aa0960df25d14bc4
|
|
...had to adapt one test that had picked this service apparently arbitrarily.
Change-Id: Iaa17b7c622b9ac3601beb3ba931f7b1d99f649f1
|