summaryrefslogtreecommitdiff
path: root/desktop/Package_branding_custom.mk
AgeCommit message (Collapse)AuthorFilesLines
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl1-2/+0
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-09-25Start hacking --enable-canonical-installation-tree-structure back into shapeTor Lillqvist1-2/+2
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-23Try to fix cross-compilationTor Lillqvist1-1/+1
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-11Towards a working instdir for Mac OS XStephan Bergmann1-1/+1
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-05-10More gb_PROGRAMDIRNAME clean upStephan Bergmann1-2/+2
Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9
2013-05-10Abstract over PACKAGEDIRNAME as it is MacOS rather than program on Mac OS XStephan Bergmann1-2/+2
Otherwise, the FILELIST scp2 items would create a program directory even on Mac OS X, before gid_Brand_Unixlink_Program creates the program -> MacOS symlink. (gb_Pyuno_PROGRAMDIRNAME shoudl be renamed to something more general than Pyuno, and maybe more */Package_*.mk would benefit from using it.) Change-Id: Ib6fc8d1abaf3b1a47a0f026a62bf0abdb14fc521
2013-04-30install branding images using filelistsDavid Tardon1-0/+22
This also reinstates the use of brand_dev/intro.png for non-release builds, lost with gbuildization of instsetoo_native (commit 1d84e9d1d363bd550129efcbeafe670c0a049dd0). Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e