Commit Graph

9 Commits

Author SHA1 Message Date
8df17a3409 gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-28 20:17:26 +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
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
cea7cca5c8 remove obsolete CDE integration, and make TDE launcher conditional.
Change-Id: I5e830cd3f44627d789d789748e1b0f0ff5590d91
2013-07-01 15:39:24 +01:00
717c9643bd More gb_PROGRAMDIRNAME clean up
Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9
2013-05-10 14:06:47 +02:00
6514956d42 install scripts from shell using filelists
The FILELIST install method is really tailored to large sets of closely
related files. It is not such a great idea to apply it just to move some
unrelated files, delivered from a single module, out of $(OUTDIR), like
here, because it requires splitting one Package to several to allow the
files to be placed to different installation modules in scp2. The extra
makefile increases the overhead needed to place a file into an
installation set. We really need a better way to handle this...

Change-Id: I2f271562d8773152e69d284b4fe8ae356dea0945
2013-05-04 16:44:48 +02:00
62badf3828 Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-22 09:37:38 +01:00
d4efa8b0cf gbuildize shell
Change-Id: I91a89f9d0bd1eb88a94179f1c1a41bc832599fed
2012-05-29 07:33:44 +02:00