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 <riccardo.magliocchetti@gmail.com>
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
@@ -123,58 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/engine3d/view3d \
svx/source/engine3d/view3d1 \
svx/source/engine3d/viewpt3d2 \
- svx/source/fmcomp/dbaexchange \
- svx/source/fmcomp/fmgridcl \
- svx/source/fmcomp/fmgridif \
- svx/source/fmcomp/gridcell \
- svx/source/fmcomp/gridcols \
- svx/source/fmcomp/gridctrl \
- svx/source/fmcomp/trace \
- svx/source/fmcomp/xmlexchg \
- svx/source/form/dataaccessdescriptor \
- svx/source/form/datalistener \
- svx/source/form/datanavi \
- svx/source/form/dbtoolsclient \
- svx/source/form/delayedevent \
- svx/source/form/fmcontrolbordermanager \
- svx/source/form/fmcontrollayout \
- svx/source/form/fmdmod \
- svx/source/form/fmdocumentclassification \
- svx/source/form/fmdpage \
- svx/source/form/fmexch \
- svx/source/form/fmexpl \
- svx/source/form/fmitems \
- svx/source/form/fmmodel \
- svx/source/form/fmobj \
- svx/source/form/fmpage \
- svx/source/form/fmpgeimp \
- svx/source/form/fmscriptingenv \
- svx/source/form/fmservs \
- svx/source/form/fmshell \
- svx/source/form/fmshimp \
- svx/source/form/fmtextcontroldialogs \
- svx/source/form/fmtextcontrolfeature \
- svx/source/form/fmtextcontrolshell \
- svx/source/form/fmtools \
- svx/source/form/fmundo \
- svx/source/form/fmview \
- svx/source/form/fmvwimp \
- svx/source/form/formcontrolfactory \
- svx/source/form/formcontroller \
- svx/source/form/formcontrolling \
- svx/source/form/formdispatchinterceptor \
- svx/source/form/formfeaturedispatcher \
- svx/source/form/formtoolbars \
- svx/source/form/legacyformcontroller \
- svx/source/form/navigatortree \
- svx/source/form/navigatortreemodel \
- svx/source/form/ParseContext \
- svx/source/form/sdbdatacolumn \
- svx/source/form/sqlparserclient \
- svx/source/form/stringlistresource \
- svx/source/form/typeconversionclient \
- svx/source/form/typemap \
- svx/source/form/xfm_addcondition \
svx/source/gallery2/codec \
svx/source/gallery2/galbrws \
svx/source/gallery2/galbrws1 \
@@ -433,6 +381,63 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/xoutdev/xtablend \
))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+$(eval $(call gb_Library_add_exception_objects,svxcore,\
+ svx/source/fmcomp/dbaexchange \
+ svx/source/fmcomp/fmgridcl \
+ svx/source/fmcomp/fmgridif \
+ svx/source/fmcomp/gridcell \
+ svx/source/fmcomp/gridcols \
+ svx/source/fmcomp/gridctrl \
+ svx/source/fmcomp/trace \
+ svx/source/fmcomp/xmlexchg \
+ svx/source/form/dataaccessdescriptor \
+ svx/source/form/datalistener \
+ svx/source/form/datanavi \
+ svx/source/form/dbtoolsclient \
+ svx/source/form/delayedevent \
+ svx/source/form/fmcontrolbordermanager \
+ svx/source/form/fmcontrollayout \
+ svx/source/form/fmdmod \
+ svx/source/form/fmdocumentclassification \
+ svx/source/form/fmdpage \
+ svx/source/form/fmexch \
+ svx/source/form/fmexpl \
+ svx/source/form/fmitems \
+ svx/source/form/fmmodel \
+ svx/source/form/fmobj \
+ svx/source/form/fmpage \
+ svx/source/form/fmpgeimp \
+ svx/source/form/fmscriptingenv \
+ svx/source/form/fmservs \
+ svx/source/form/fmshell \
+ svx/source/form/fmshimp \
+ svx/source/form/fmtextcontroldialogs \
+ svx/source/form/fmtextcontrolfeature \
+ svx/source/form/fmtextcontrolshell \
+ svx/source/form/fmtools \
+ svx/source/form/fmundo \
+ svx/source/form/fmview \
+ svx/source/form/fmvwimp \
+ svx/source/form/formcontrolfactory \
+ svx/source/form/formcontroller \
+ svx/source/form/formcontrolling \
+ svx/source/form/formdispatchinterceptor \
+ svx/source/form/formfeaturedispatcher \
+ svx/source/form/formtoolbars \
+ svx/source/form/legacyformcontroller \
+ svx/source/form/navigatortree \
+ svx/source/form/navigatortreemodel \
+ svx/source/form/ParseContext \
+ svx/source/form/sdbdatacolumn \
+ svx/source/form/sqlparserclient \
+ svx/source/form/stringlistresource \
+ svx/source/form/typeconversionclient \
+ svx/source/form/typemap \
+ svx/source/form/xfm_addcondition \
+))
+endif
+
# the following source file can't be compiled with optimization by some compilers (crash or
endless loop):
# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
# the latter is currently not supported by gbuild and needs a fix here later
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index bd07e7b..9eaba5b 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -56,7 +56,9 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeFunctionPar
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hxx,svx/ucsubset.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sderitm.hxx,svx/sderitm.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/obj3d.hxx,svx/obj3d.hxx))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbcharsethelper.hxx,svx/dbcharsethelper.hxx))
+endif
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdangitm.hxx,svx/sdangitm.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxtraitm.hxx,svx/sxtraitm.hxx))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index fc51422..5f16af1 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -563,14 +563,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/config/uinums \
sw/source/ui/config/usrpref \
sw/source/ui/config/viewopt \
- sw/source/ui/dbui/dbmgr \
- sw/source/ui/dbui/dbtree \
- sw/source/ui/dbui/dbui \
- sw/source/ui/dbui/maildispatcher \
- sw/source/ui/dbui/mailmergechildwindow \
- sw/source/ui/dbui/mailmergehelper \
- sw/source/ui/dbui/mmconfigitem \
- sw/source/ui/dbui/swdbtoolsclient \
sw/source/ui/dialog/SwSpellDialogChildWindow \
sw/source/ui/dialog/regionsw \
sw/source/ui/dialog/swabstdlg \
@@ -738,6 +730,19 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/wrtsh/wrtundo \
))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+$(eval $(call gb_Library_add_exception_objects,sw,\
+ sw/source/ui/dbui/dbmgr \
+ sw/source/ui/dbui/dbtree \
+ sw/source/ui/dbui/dbui \
+ sw/source/ui/dbui/maildispatcher \
+ sw/source/ui/dbui/mailmergechildwindow \
+ sw/source/ui/dbui/mailmergehelper \
+ sw/source/ui/dbui/mmconfigitem \
+ sw/source/ui/dbui/swdbtoolsclient \
+))
+endif
+
$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
--
1.7.5.4
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.