Re: [RFC] x11 / cairo-less build try #2
Hi Michael,
Il 08/02/2012 16:37, Michael Meeks ha scritto:
Hi Riccardo,
On Tue, 2012-02-07 at 18:19 +0100, Riccardo Magliocchetti wrote:
I've progressed a bit with X11 / cairo less build. Now everything builds
but somethings chokes in make dev-install:
As Matus says, you'll need to add some conditionals to the scp2 stuff -
both in the makefile.mk's (or you can update SCPDEFS as generated by
configure.in), and to add #ifndef HEADLESS's around the place there :-)
When you've done that a rm -Rf unxlngi6.pro ; build deliver in scp2
- before re-running make install is prolly what you want to do.
Fixed this issue but now something failing in scp2 during dev-install:
... installing module gid_Module_Root_Files_Images ...
DestDir:
Rootpath: /home/rm/src/libo/solver/unxlngx6.pro/installation/opt
:
[error snip]
Does this means that gid_Module_Root_Files_Images is breaking or is it
the next one?
The Library_vcl.mk is becoming a bit of a rats-nest of cut/paste, I
wonder if we can chunk up the common files into another variable that we
can re-use in these different per-platform sections; I appreciate
everyone else just munged it but ... ;-)
I'll take a look at it.
I'm surprised we need to disable lingucomponent, linguistic,
lotuswordpro, oovbaapi, vbahelper and wizards to build headless: of
course, quite probably we don't want at least some of those - but did
they really cause build issues ?
Quite the opposite, removing them cause build issues :)
Otherwise, it looks rather sane really :-)
Nice!
A couple of tests has been disabled because of no suitable windowing
system found, exiting.\n error from
vcl/unx/generic/plugadapt/salplug.cxx::CreateSalInstance(). And i
suppose the same error will bite me when i'll try yo run what i have
compiled.
Oh - that is odd. Do you really want to create the plugadapt instance ?
or have your own headless instance (mirroring a cut down version of the
Android one perhaps ?).
It looks it is needed by vcl/headless/{svpdata.cxx,svmain.cxx,svapp.cxx}
. vcl does not build anymore if i remove vcl/unx/generic/plugadapt/salplug.
Of course, it is necessary to have the vcl/headless/ stuff connected up
somewhere, we'll still need SalFrames in order to post events, and some
sort of event loop to run the app, but it shouldn't be hard to get a
really simple bitmap-rendering version in there.
Will think about that when i'll finally have a build.
Thanks a lot!
--
Riccardo Magliocchetti
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] x11 / cairo-less build try #2
Hi Matúš, Il 07/02/2012 23:57, Matúš Kukan ha scritto: Hello there, On 7 February 2012 18:19, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: I've progressed a bit with X11 / cairo less build. Now everything builds but somethings chokes in make dev-install: http://pastebin.com/qsi0wPFR Where are these missing files listed? I suppose i have to add some conditionals. git grep for them in scp2/ Only type the base of the name: 'git grep acc | grep LIB' .. or 'git grep acc | grep RES' for .res file If someone is so keen to take a look at the patches and point out what could be improved, uneeded changes (RepositoryModule_ooo.mk?) it'll be great. Seems like RepositoryModule_ooo.mk is used only when running 'make check'. I don't think you need to change it. Will try without changes there. Are you sure you want to change GUIBASE ? I am not sure about anything :) I think i need to follow unx as close as possible, cloning GUIBASE seemed reasonable, i'm open to everything that fits better. For example missing files: spadmin, spaen-US.res.. are from padmin/ module and there is ifeq ($(GUIBASE),unx) in Module_padmin.mk I'm not sure i want this stuff since it looks like to need CUPS related stuff. Thanks! -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] x11 / cairo-less build try #2
Hi Riccardo, On Tue, 2012-02-07 at 18:19 +0100, Riccardo Magliocchetti wrote: I've progressed a bit with X11 / cairo less build. Now everything builds but somethings chokes in make dev-install: As Matus says, you'll need to add some conditionals to the scp2 stuff - both in the makefile.mk's (or you can update SCPDEFS as generated by configure.in), and to add #ifndef HEADLESS's around the place there :-) When you've done that a rm -Rf unxlngi6.pro ; build deliver in scp2 - before re-running make install is prolly what you want to do. Attached all the changes that i have locally, they are diffed against an old master and i'd like to have a working build before rebasing. Makes good sense :-) If someone is so keen to take a look at the patches and point out what could be improved, uneeded changes (RepositoryModule_ooo.mk?) it'll be great. Of course, I'd push to something that works, and then clean it up later; but some thoughts: The Library_vcl.mk is becoming a bit of a rats-nest of cut/paste, I wonder if we can chunk up the common files into another variable that we can re-use in these different per-platform sections; I appreciate everyone else just munged it but ... ;-) I'm surprised we need to disable lingucomponent, linguistic, lotuswordpro, oovbaapi, vbahelper and wizards to build headless: of course, quite probably we don't want at least some of those - but did they really cause build issues ? Otherwise, it looks rather sane really :-) A couple of tests has been disabled because of no suitable windowing system found, exiting.\n error from vcl/unx/generic/plugadapt/salplug.cxx::CreateSalInstance(). And i suppose the same error will bite me when i'll try yo run what i have compiled. Oh - that is odd. Do you really want to create the plugadapt instance ? or have your own headless instance (mirroring a cut down version of the Android one perhaps ?). Of course, it is necessary to have the vcl/headless/ stuff connected up somewhere, we'll still need SalFrames in order to post events, and some sort of event loop to run the app, but it shouldn't be hard to get a really simple bitmap-rendering version in there. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[RFC] x11 / cairo-less build try #2
Hello,
I've progressed a bit with X11 / cairo less build. Now everything builds
but somethings chokes in make dev-install:
http://pastebin.com/qsi0wPFR
Where are these missing files listed? I suppose i have to add some
conditionals.
Attached all the changes that i have locally, they are diffed against an
old master and i'd like to have a working build before rebasing.
If someone is so keen to take a look at the patches and point out what
could be improved, uneeded changes (RepositoryModule_ooo.mk?) it'll be
great.
A couple of tests has been disabled because of no suitable windowing
system found, exiting.\n error from
vcl/unx/generic/plugadapt/salplug.cxx::CreateSalInstance(). And i
suppose the same error will bite me when i'll try yo run what i have
compiled.
thanks in advance
--
Riccardo Magliocchetti
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 362434d..eb16dc3 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -25,7 +25,6 @@
$(eval $(call gb_Module_Module,tail_end))
$(eval $(call gb_Module_add_moduledirs,tail_end,\
-accessibility \
animations \
avmedia \
basctl \
@@ -53,8 +52,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
lingucomponent \
linguistic \
lotuswordpro \
-MathMLDTD \
-Mesa \
np_sdk \
oox \
package \
@@ -78,7 +75,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
unoxml \
uui \
vbahelper \
-wizards \
writerfilter \
writerperfect \
xmerge \
@@ -86,6 +82,15 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
xmlsecurity \
))
+ifneq ($(GUIBASE),headless)
+$(eval $(call gb_Module_add_targets,tail_end,\
+accessibility \
+MathMLDTD \
+Mesa \
+wizards \
+))
+endif
+
ifeq ($(MERGELIBS),TRUE)
$(eval $(call gb_Module_add_targets,tail_end,\
Library_merged \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 3f0f023..2285176 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -29,8 +29,6 @@
$(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
-accessibility \
-animations \
basctl \
basebmp \
basegfx \
@@ -50,7 +48,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
dtrans \
editeng \
eventattacher \
- extensions \
fileaccess \
filter \
forms \
@@ -61,25 +58,17 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
i18npool \
i18nutil \
idl \
-lingucomponent \
-linguistic \
-lotuswordpro \
-MathMLDTD \
-Mesa \
nlpsolver \
np_sdk \
o3tl \
offapi \
-oovbaapi \
oox \
package \
padmin \
psprint_config \
regexp \
-reportdesign \
sal \
salhelper \
-sane \
sax \
sc \
scaddins \
@@ -95,21 +84,17 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
svx \
sw \
swext \
-twain \
toolkit \
tools \
ucb \
ucbhelper \
udkapi \
-unixODBC \
UnoControls \
unotools \
unoxml \
ure \
uui \
-vbahelper \
vcl \
-wizards \
writerfilter \
writerperfect \
xmerge \
@@ -120,6 +105,26 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
xmlscript \
))
+ifneq ($(GUIBASE),headless)
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+accessibility \
+animations \
+extensions \
+lingucomponent \
+linguistic \
+lotuswordpro \
+MathMLDTD \
+Mesa \
+oovbaapi \
+reportdesign \
+sane \
+twain \
+unixODBC \
+vbahelper \
+wizards \
+))
+endif
+
ifneq ($(SOLAR_JAVA),)
ifneq $(OOO_JUNIT_JAR)
$(eval $(call gb_Module_add_moduledirs,ooo,\
diff --git a/configure.in b/configure.in
index 9a348e3..2e0f393 100644
--- a/configure.in
+++ b/configure.in
@@ -723,6 +723,11 @@ AC_ARG_ENABLE(kde4,
both KDE3 and KDE4.]),
,)
+AC_ARG_ENABLE(headless,
+AS_HELP_STRING([--enable-headless],
+[Disable building of GUIs to reduce dependencies. Useful for server usage.]),
+,)
+
AC_ARG_ENABLE(unix-qstart-libpng,
AS_HELP_STRING([--disable-unix-qstart-libpng],
[On UNIX systems, we have a faster splash app, that can use libpng to
@@ -2935,6 +2940,10 @@ solaris*)
;;
esac
+if test $enable_headless = yes; then
+GUIBASE=headless
+fi
+
INPATH=${OUTPATH}${PROEXT}
AC_SUBST(COM)
AC_SUBST(CPU)
@@ -3163,6 +3172,19 @@ else
fi
AC_SUBST(DISABLE_STRIP)
+if test $enable_headless = yes; then
+# be sure to do not mess with uneeded stuff
+test_randr=no
+test_xrender=no
+test_cups=no
+test_fontconfig=yes
+test_gtk=no
+build_gstreamer=no
+test_kde=no
+test_kde4=no
+test_unix_quickstarter=no
+fi
+
dnl check for cups support
dnl ===
if test $test_cups = yes; then
@@ -7100,10 +7122,14 @@ AC_SUBST(ENABLE_NSPLUGIN)
dnl ***
dnl
Re: [RFC] x11 / cairo-less build try #2
Hello there, On 7 February 2012 18:19, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: I've progressed a bit with X11 / cairo less build. Now everything builds but somethings chokes in make dev-install: http://pastebin.com/qsi0wPFR Where are these missing files listed? I suppose i have to add some conditionals. git grep for them in scp2/ Only type the base of the name: 'git grep acc | grep LIB' .. or 'git grep acc | grep RES' for .res file If someone is so keen to take a look at the patches and point out what could be improved, uneeded changes (RepositoryModule_ooo.mk?) it'll be great. Seems like RepositoryModule_ooo.mk is used only when running 'make check'. I don't think you need to change it. Are you sure you want to change GUIBASE ? For example missing files: spadmin, spaen-US.res.. are from padmin/ module and there is ifeq ($(GUIBASE),unx) in Module_padmin.mk HTH, Matúš ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
