Age | Commit message (Collapse) | Author |
|
Change-Id: Icc48efc2f6c085ccf0754620dc1cbf5132a7f824
Reviewed-on: https://gerrit.libreoffice.org/49551
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
|
|
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
|
|
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
|
|
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
|
|
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
|
|
Change-Id: I95402d81aef426de14ca928ea811aac6f1cd289d
|
|
Further gnumake fixups, package the files in the Gallery rules.
Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8
|
|
Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15
|
|
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
|
|
|
|
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>
|