[Libreoffice-commits] .: 4 commits - config_host.mk.in configure.in connectivity/inc RepositoryFixes.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/Module_sc.mk solenv/gbuild sw/CppunitTest_sw_layout_test.mk sw/CppunitTest_sw_macros_test.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Feb 21 04:21:59 PST 2012
RepositoryFixes.mk | 4 ++
config_host.mk.in | 1
configure.in | 6 ++-
connectivity/inc/connectivity/sqlparse.hxx | 2 +
sc/CppunitTest_sc_cellrangeobj.mk | 2 -
sc/CppunitTest_sc_datapilottableobj.mk | 2 -
sc/Module_sc.mk | 3 +
solenv/gbuild/CppunitTest.mk | 17 ++++++++
solenv/gbuild/LinkTarget.mk | 2 +
solenv/gbuild/Module.mk | 12 ------
solenv/gbuild/extensions/post_DisableIosUnitchecks.mk | 35 ------------------
solenv/gbuild/gbuild.mk | 4 ++
solenv/gbuild/platform/IOS_ARM_GCC.mk | 16 +-------
sw/CppunitTest_sw_layout_test.mk | 2 -
sw/CppunitTest_sw_macros_test.mk | 2 -
15 files changed, 42 insertions(+), 68 deletions(-)
New commits:
commit 136f53f58e89b13e4d89571fef25b8ba6679e6b4
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Feb 21 14:09:03 2012 +0200
More clever way to filter out component files for libs not built
I.e. BASIC stuff for iOS and database connectivity stuff when using
--disable-database-connectivity. All of this quite experimental so
far, using the latter will break your build.
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 530aa9a..a559777 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -91,8 +91,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_cellrangesbase,\
))
$(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\
- $(if $(filter-out $(OS),IOS), \
- basic/util/sb) \
+ basic/util/sb \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 9b21db0..b1e54b0 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -90,8 +90,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilotfieldobj,\
))
$(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\
- $(if $(filter-out $(OS),IOS), \
- basic/util/sb) \
+ basic/util/sb \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 9e06aec..1ac9893 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -90,12 +90,10 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilottableobj,\
))
$(eval $(call gb_CppunitTest_add_components,sc_datapilottableobj,\
- $(if $(filter-out $(OS),IOS), \
- basic/util/sb) \
+ basic/util/sb \
comphelper/util/comphelp \
configmgr/source/configmgr \
- $(if $(filter-out $(OS),IOS), \
- dbaccess/util/dba) \
+ dbaccess/util/dba \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
forms/util/frm \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 8a4a3cc..32f7d47 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -87,15 +87,13 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
))
$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
- $(if $(filter-out $(OS),IOS), \
- basic/util/sb) \
+ basic/util/sb \
chart2/source/controller/chartcontroller \
chart2/source/tools/charttools \
chart2/source/model/chartmodel \
comphelper/util/comphelp \
configmgr/source/configmgr \
- $(if $(filter-out $(OS),IOS), \
- dbaccess/util/dba) \
+ dbaccess/util/dba \
eventattacher/source/evtatt \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e4065bd..acaf76b 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -178,8 +178,21 @@ $(call gb_CppunitTest_get_target,$(1)) : \
endef
+# Given a list of component files, filter out those corresponding
+# to libraries not built in this configuration.
+define gb_CppunitTest__filter_not_built_components
+$(filter-out \
+ $(if $(filter $(OS),IOS), \
+ basic/util/sb \
+ sw/util/vbaswobj \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe) \
+ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),, \
+ dbaccess/util/dba),$(1))
+endef
+
define gb_CppunitTest_add_components
-$(foreach component,$(2),$(call gb_CppunitTest_add_component,$(1),$(component)))
+$(foreach component,$(call gb_CppunitTest__filter_not_built_components,$(2)),$(call gb_CppunitTest_add_component,$(1),$(component)))
endef
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index a14af32..97e6bf3 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -134,6 +134,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_layout_test,\
$(call gb_CppunitTest_get_target,sw_layout_test) : \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,msword) \
- $(call gb_Library_get_target,vbaswobj) \
+ $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index a2f4c4e..00d092a 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -136,6 +136,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
$(call gb_CppunitTest_get_target,sw_macros_test) : \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,msword) \
- $(call gb_Library_get_target,vbaswobj) \
+ $(if $(filter-out $(OS),IOS),$(call gb_Library_get_target,vbaswobj)) \
# vim: set noet sw=4 ts=4:
commit f9a5c4cbc275df6dd5a3b31323b1d00343e8e4f0
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Feb 21 12:47:34 2012 +0200
More --disable-database-connectivity work, still experimental
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index b1cb18f..95602be 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -137,4 +137,8 @@ gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAM
endif
+ifeq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+gb_Library_FILENAMES := $(patsubst dbtools:libdbtools%,,$(gb_Library_FILENAMES))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/config_host.mk.in b/config_host.mk.in
index 0385fa4..3da38d9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -78,6 +78,7 @@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
export DIRECTXSDK_LIB=@DIRECTXSDK_LIB@
export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
export DISABLE_ATL=@DISABLE_ATL@
+export DISABLE_DBCONNECTIVITY=@DISABLE_DBCONNECTIVITY@
export DISABLE_LINKOO=@DISABLE_LINKOO@
export DISABLE_NEON=@DISABLE_NEON@
export DISABLE_PYTHON=@DISABLE_PYTHON@
diff --git a/configure.in b/configure.in
index 303b5c8..12ce546 100644
--- a/configure.in
+++ b/configure.in
@@ -384,7 +384,7 @@ AC_ARG_ENABLE(ext-barcode,
AC_ARG_ENABLE(database-connectivity,
AS_HELP_STRING([--disable-database-connectivity],
- [Disable various database connectivity.])
+ [Disable various database connectivity. Work in progress, don't use.])
)
AC_ARG_ENABLE(ext-diagram,
@@ -2040,9 +2040,13 @@ if test -z "$enable_database_connectivity"; then
fi
fi
+DISABLE_DBCONNECTIVITY=''
if test "$enable_database_connectivity" = yes; then
BUILD_TYPE="$BUILD_TYPE DBCONNECTIVITY"
+else
+ DISABLE_DBCONNECTIVITY='TRUE'
fi
+AC_SUBST(DISABLE_DBCONNECTIVITY)
dnl ===================================================================
dnl Extra check for Windows. Cygwin builds need gcc to build dmake
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index b088960..6b3f975 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -31,6 +31,7 @@
#include <com/sun/star/uno/Reference.h>
#include <osl/mutex.hxx>
#include <connectivity/sqlnode.hxx>
+#ifndef DISABLE_DBCONNECTIVITY
#ifndef YYBISON
#ifndef FLEX_SCANNER
#ifndef BISON_INCLUDED
@@ -39,6 +40,7 @@
#endif
#endif
#endif
+#endif
#include <com/sun/star/i18n/XCharacterClassification.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/XLocaleData.hpp>
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 005d81b..0ae3a34 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -241,6 +241,10 @@ ifeq ($(strip $(ENABLE_HEADLESS)),TRUE)
gb_GLOBALDEFS += -DLIBO_HEADLESS
endif
+ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE)
+gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY
+endif
+
ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
endif
commit efa6a5f0444ab2299f91608f4a5b78848814458e
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Feb 20 23:24:13 2012 +0200
Filter out stuff not built for iOS
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index a6a43d5..530aa9a 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -91,7 +91,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_cellrangesbase,\
))
$(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\
- basic/util/sb \
+ $(if $(filter-out $(OS),IOS), \
+ basic/util/sb) \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index b1e54b0..9b21db0 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -90,7 +90,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilotfieldobj,\
))
$(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\
- basic/util/sb \
+ $(if $(filter-out $(OS),IOS), \
+ basic/util/sb) \
comphelper/util/comphelp \
configmgr/source/configmgr \
dbaccess/util/dba \
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 5e14b91..9e06aec 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -90,10 +90,12 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilottableobj,\
))
$(eval $(call gb_CppunitTest_add_components,sc_datapilottableobj,\
- basic/util/sb \
+ $(if $(filter-out $(OS),IOS), \
+ basic/util/sb) \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dbaccess/util/dba \
+ $(if $(filter-out $(OS),IOS), \
+ dbaccess/util/dba) \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
forms/util/frm \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 32f7d47..8a4a3cc 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -87,13 +87,15 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
))
$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
- basic/util/sb \
+ $(if $(filter-out $(OS),IOS), \
+ basic/util/sb) \
chart2/source/controller/chartcontroller \
chart2/source/tools/charttools \
chart2/source/model/chartmodel \
comphelper/util/comphelp \
configmgr/source/configmgr \
- dbaccess/util/dba \
+ $(if $(filter-out $(OS),IOS), \
+ dbaccess/util/dba) \
eventattacher/source/evtatt \
fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index a221f22..b0b3441 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -54,7 +54,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
JunitTest_sc_complex \
JunitTest_sc_unoapi \
CppunitTest_sc_cellrangeobj \
- CppunitTest_sc_databaserangeobj \
+ $(if $(filter-out $(OS),IOS), \
+ CppunitTest_sc_databaserangeobj) \
CppunitTest_sc_datapilottableobj \
CppunitTest_sc_datapilotfieldobj \
CppunitTest_sc_macros_test \
commit 747257231e652b75a3fb2ec63d4df114f0aff37a
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Feb 20 23:21:40 2012 +0200
Rethink cppunittest "plugins" for iOS, more to come
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 15e5aa1..e4065bd 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -51,7 +51,9 @@ endif
# gb_CppunitTest_TARGETTYPE
# gb_CppunitTest_get_filename
# DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
+ifneq ($(OS),IOS)
gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
+endif
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3edc66f..555a805 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -830,7 +830,9 @@ endef
define gb_LinkTarget_add_linktarget_objects
$(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget)))
+ifneq ($(OS),IOS)
$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS += $(foreach linktarget,$(2),$(call gb_LinkTarget_get_objects_list,$(linktarget)))
+endif
endef
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index f93b277..64d7d13 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -214,18 +214,6 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
endef
-# We don't build normal unit test dynamic libraries (CppUnit
-# "plugins") for iOS, but instead statically linked unit test
-# executables, so make gb_Module_add_check_target a no-op for iOS.
-
-# As such we could build normal "plugins", as dynamic loading of
-# modules presumably does work on iOS, it is just not allowed in apps
-# distributed through the App Store. Unit testing at LO development
-# time obviously is not anything that would be distributed as
-# apps. But let's not, as we have to make this stuff work without
-# dynamic loading anyway if the App Store is an eventual target, and
-# why shouldn't it be.
-
define gb_Module_add_check_target
$(call gb_Module__read_targetfile,$(1),$(2),check target)
diff --git a/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk b/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
deleted file mode 100644
index 53eb67d..0000000
--- a/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# [ Copyright (C) 2011 Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (initial developer) ]
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-# disable check target on IOS
-ifeq ($(OS),IOS)
-gb_Module_add_check_target=
-gb_Module_add_slowcheck_target=
-endif
-
-
-# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 429d7dd..e72c20d 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -183,8 +183,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
-$(if $(filter Library StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
+$(call gb_LinkTarget__command_staticlink,$(1))
endef
@@ -276,7 +275,7 @@ endef
gb_CppunitTest_CPPTESTPRECOMMAND := :
gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .dylib
+gb_CppunitTest_EXT := .a
gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
@@ -286,17 +285,6 @@ $(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
endef
-# JunitTest class
-
-define gb_JunitTest_JunitTest_platform
-$(call gb_JunitTest_get_target,$(1)) : DEFS := \
- -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}" \
- -Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
- -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
- -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \
-
-endef
-
# Python
gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
More information about the Libreoffice-commits
mailing list