Commit graph

9 commits

Author SHA1 Message Date
Tor Lillqvist
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
Stephan Bergmann
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
Tor Lillqvist
058a3d1c46 Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.

Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
2013-08-18 21:11:16 +03:00
Michael Meeks
96c7e37f02 migrate galleries to new, cleaner build infrastructure.
Change-Id: I95402d81aef426de14ca928ea811aac6f1cd289d
2013-05-15 09:37:45 +01:00
Michael Meeks
b54709dd2c remove pre-compiled textshapes and transportation galleries.
Further gnumake fixups, package the files in the Gallery rules.

Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8
2013-05-15 09:37:42 +01:00
Michael Meeks
22ca7c45b9 galleries: implement first self-built sound gallery
Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15
2013-05-15 09:37:39 +01:00
Armin Le Grand
fb6f2e1109 Resolves: #i121407# Gallery reorganizations...
and additions of new themes

(cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c)

Conflicts:
	extras/prj/build.lst
	extras/source/gallery/bullets/makefile.mk
	extras/source/gallery/gallery_system/sg2.sdg
	extras/source/gallery/gallery_system/sg2.sdv
	extras/source/gallery/gallery_system/sg2.thm
	extras/util/target.pmk
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_extra_ooo.scp
	svx/inc/galtheme.hrc
	svx/source/gallery2/gallery1.cxx
	svx/source/gallery2/galobj.cxx
	svx/source/gallery2/galtheme.src
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/alpha.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmap3.cxx
	vcl/source/gdi/bitmapex.cxx

(cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f)

Conflicts:
	vcl/source/gdi/bitmap3.cxx

Change-Id: If4b2397b889f914487f2135679250c175181e1df
2013-05-10 17:04:28 +01:00
Michael Meeks
3bcd2d3787 remove sg25 gallery packaging rules. 2013-04-22 10:41:07 +01:00
Julien Nabet
192c3ca833 fdo#63197: Convert list below:
Zip_gallbullets, Zip_gallhtmlexpo, Zip_gallroot, Zip_gallsound
Zip_gallsounds, Zip_gallsystem, Zip_gallwwwback, Zip_gallwwwgraf

Change-Id: Ic326d83ad69968a4871518065277e863eb8815a8
Reviewed-on: https://gerrit.libreoffice.org/3382
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-14 17:56:23 +00:00
Renamed from extras/Zip_gallsystem.mk (Browse further)