Re: [PUSHED] Building with --disable-database-connectivity
Hi Tor, Il 21/02/2012 14:38, Tor Lillqvist ha scritto: Hmm, I am not sure. I still think it might be too early to start trying to use --disable-database-connectivity for "normal" OSes. (Even if building for "headless"). But what the heck, pushed it anyway, with a slight modification: instead of introducing conditionals in Library_sc.mk to bypass just one source file, I bypass its contents with #ifndef DISABLE_DBCONNECTIVITY. Cool! thanks a lot! Will rebase my stuff on top of master and see if i can proceed further. -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Building with --disable-database-connectivity
Hmm, I am not sure. I still think it might be too early to start trying to use --disable-database-connectivity for "normal" OSes. (Even if building for "headless"). But what the heck, pushed it anyway, with a slight modification: instead of introducing conditionals in Library_sc.mk to bypass just one source file, I bypass its contents with #ifndef DISABLE_DBCONNECTIVITY. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building with --disable-database-connectivity
Hi Tor, Il 21/02/2012 12:57, Tor Lillqvist ha scritto: I share your very same sentiments with my --headless work, no need for db stuff here. So I'd try to find some time to play with this even if it is experimental. OK. But I am just hacking on it so don't try to work on it right now;) --tml Cool, seen the commit in master, anyway that's what i've done this morning, feel free to reuse it if you want. thanks -- Riccardo Magliocchetti >From a18dfb581eac66cc9638d9a810985d1a0991de5e Mon Sep 17 00:00:00 2001 From: Riccardo Magliocchetti Date: Tue, 21 Feb 2012 12:49:09 +0100 Subject: [PATCH] Fix most of the build with --disable-database-connectivity --- extensions/Module_extensions.mk | 17 -- forms/Module_forms.mk |2 + sc/Library_sc.mk|7 ++- svx/Library_svx.mk | 25 + svx/Library_svxcore.mk | 109 -- svx/Package_inc.mk |2 + sw/Library_sw.mk| 21 +--- 7 files changed, 106 insertions(+), 77 deletions(-) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 7faa693..d0490ea 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -29,21 +29,26 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_abp \ - AllLangResTarget_bib \ - AllLangResTarget_dbp \ - AllLangResTarget_pcr \ AllLangResTarget_scn \ AllLangResTarget_upd \ Library_abp \ - Library_bib \ - Library_dbp \ Library_log \ - Library_pcr \ Library_res \ Library_scn \ +)) + +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_bib \ + AllLangResTarget_dbp \ + AllLangResTarget_pcr \ + Library_bib \ + Library_dbp \ + Library_pcr \ Package_bib \ Package_pcr \ )) +endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index 6f14722..4f5e99e 100644 --- a/forms/Module_forms.mk +++ b/forms/Module_forms.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,forms)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,forms,\ AllLangResTarget_frm \ Library_frm \ @@ -38,5 +39,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\ JunitTest_forms_unoapi \ JunitTest_forms_complex \ )) +endif # vim: set noet sw=4 ts=4: diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 351386d..9f27a6e 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -338,7 +338,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/docshell/docsh5 \ sc/source/ui/docshell/docsh6 \ sc/source/ui/docshell/docsh7 \ - sc/source/ui/docshell/docsh8 \ sc/source/ui/docshell/editable \ sc/source/ui/docshell/externalrefmgr \ sc/source/ui/docshell/impex \ @@ -551,6 +550,12 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/view/waitoff \ )) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Library_add_exception_objects,sc,\ + sc/source/ui/docshell/docsh8 \ +)) +endif + $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc)) $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 97db17f..a545c40 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -147,16 +147,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/txenctab \ svx/source/dialog/wrapfield \ svx/source/engine3d/float3d \ -svx/source/fmcomp/dbaobjectex \ -svx/source/form/databaselocationinput \ -svx/source/form/dbcharsethelper \ -svx/source/form/filtnav \ -svx/source/form/fmobjfac \ -svx/source/form/fmPropBrw \ -svx/source/form/fmsrccfg \ -svx/source/form/fmsrcimp \ -svx/source/form/tabwin \ -svx/source/form/tbxform \ svx/source/items/algitem \ svx/source/items/hlnkitem \ svx/source/items/numfmtsh \ @@ -213,6 +203,21 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/unogallery/unogalthemeprovider \ )) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Library_use_external,svx,icuuc)) +svx/source/fmcomp/dbaobjectex \ +svx/source/form/databaselocationinput \ +svx/source/form/dbcharsethelper \ +svx/source/form/filtnav \ +svx/source/form/fmobjfac \ +svx/source/form/fmPropBrw \ +svx/source/form/fmsrccfg \ +svx/source/form/fmsrcimp \ +svx/source/form/tabwin \ +svx/source/form/tbxform \ +)) +endif + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportunx \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 508622f..a4e6424 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@
Re: Building with --disable-database-connectivity
> I share your very same sentiments with my --headless work, no need for db > stuff here. So I'd try to find some time to play with this even if it is > experimental. OK. But I am just hacking on it so don't try to work on it right now;) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building with --disable-database-connectivity
Hi Tor, Il 21/02/2012 12:38, Tor Lillqvist ha scritto: git master (from yesterday) does not compile for me with --disable-database-connectivity, It's experimental, don't try to use it. (It's mainly for non-desktop OSes where it probably makes less sense to provide such functionality. And actually I mostly just got tired of seeing the Android and iOS compilations spend long times in connectivity and dbaccess compiling stuff that most probably aren't wanted on those platforms, and thought I would check how simple it would be to bypass it for now.) I share your very same sentiments with my --headless work, no need for db stuff here. So I'd try to find some time to play with this even if it is experimental. thanks -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building with --disable-database-connectivity
> git master (from yesterday) does not compile for me with > --disable-database-connectivity, It's experimental, don't try to use it. (It's mainly for non-desktop OSes where it probably makes less sense to provide such functionality. And actually I mostly just got tired of seeing the Android and iOS compilations spend long times in connectivity and dbaccess compiling stuff that most probably aren't wanted on those platforms, and thought I would check how simple it would be to bypass it for now.) > I find --disable-database-connectivity interesting because i'd like to build > a base-less libreoffice. Don't, yet... (Instead, just don't package the Base parts when distributing it.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Building with --disable-database-connectivity
Hello, git master (from yesterday) does not compile for me with --disable-database-connectivity, attached a patch that tries to fix the easy stuff. Is it ok to disable the form stuff, is this only base related? Then there is svx faling in tail_build: http://pastebin.com/HbD64M2V Do you think, should i add ifdefery to .[ch]xx or just try to don't build the stuff requiring db? I find --disable-database-connectivity interesting because i'd like to build a base-less libreoffice. thanks -- Riccardo Magliocchetti diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 7faa693..d0490ea 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -29,21 +29,26 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_abp \ - AllLangResTarget_bib \ - AllLangResTarget_dbp \ - AllLangResTarget_pcr \ AllLangResTarget_scn \ AllLangResTarget_upd \ Library_abp \ - Library_bib \ - Library_dbp \ Library_log \ - Library_pcr \ Library_res \ Library_scn \ +)) + +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_bib \ + AllLangResTarget_dbp \ + AllLangResTarget_pcr \ + Library_bib \ + Library_dbp \ + Library_pcr \ Package_bib \ Package_pcr \ )) +endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index 6f14722..15bbbd3 100644 --- a/forms/Module_forms.mk +++ b/forms/Module_forms.mk @@ -26,8 +26,10 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. + $(eval $(call gb_Module_Module,forms)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,forms,\ AllLangResTarget_frm \ Library_frm \ @@ -39,4 +41,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\ JunitTest_forms_complex \ )) +endif + # vim: set noet sw=4 ts=4: ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
