Commit Graph

15 Commits

Author SHA1 Message Date
3cac074a55 generate setuprc for instdir
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
2013-11-26 19:40:32 +01:00
9ce3e2ae14 generate sofficerc for instdir
Change-Id: I06ddbc89c58384ce757ac809788f9d978677cb9c
2013-11-26 19:40:32 +01:00
8df17a3409 gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-28 20:17:26 +01:00
f924cf3c22 Related fdo#70919 Missing instdir redirect ini-file
...makes javaldx re-scan on every start.

Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b
2013-10-28 16:09:06 +01:00
7a8db272e9 Start hacking --enable-canonical-installation-tree-structure back into shape
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-25 22:13:23 +02:00
4c63fd10a5 Try to fix cross-compilation
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-23 00:54:43 +03:00
f5b840a3ee goodbye linkoo.. you have served well
This commit:
- removes linkoo and --disable-linkoo option
- removes 'dev-update' make target
- creates --disable-ooenv option
- removes LD_LIBRARY_PATH and PATH settings in ooenv

Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
2013-09-17 19:37:42 +02:00
5397b49f4d Towards a working instdir for Mac OS X
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-11 00:50:54 +02:00
2e5af9dc4f properly generate rc files
Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
2013-09-09 22:09:10 +02:00
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
717c9643bd More gb_PROGRAMDIRNAME clean up
Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9
2013-05-10 14:06:47 +02:00
ed665f24ff copy pyuno files to instdir
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
2013-05-05 15:47:54 +02:00
88a943b051 generate versionrc for instdir
Change-Id: I5f2cdcd8a17ca250413bda066acaeab24118f9d6
2013-04-28 16:34:25 +02:00
0346f008e7 gbuild: add ure-link to instdir
Change-Id: I1279ea7cdd9828598179154815a85e2a4ce7e567
2013-04-28 16:34:24 +02:00
6ae02e9c61 gbuild: generate ooenv for instdir
Change-Id: I1d2ab70a1557376f056b236c4785e013275bbb92
2013-04-28 16:34:24 +02:00