Age | Commit message (Collapse) | Author |
|
Conflicts:
ure/Package_install.mk
Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
(cherry picked from commit d6785e162fa8cc4b03de76cd2d089d62ae45c068)
|
|
...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
|
|
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: I0aa2f7384462777fc893aa282aea00aebd8dc664
|
|
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
|
|
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: 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
|
|
... 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
|
|
Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32
|