[Libreoffice-commits] .: 11 commits - hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Module_hwpfilter.mk hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk i18npool/CppunitTest_i18npool_test_breakiterator.mk i18npool/Module_i18npool.mk i18npool/RdbTarget_i18npool_test_breakiterator.mk lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Module_lotuswordpro.mk lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_test_filters.mk sc/CppunitTest_sc_ucalc.mk sc/Module_sc.mk sc/RdbTarget_sc_filters_test.mk sc/RdbTarget_sc_ucalc.mk sd/CppunitTest_sd_uimpress.mk sd/Module_sd.mk sd/RdbTarget_sd_uimpress.mk solenv/gbuild starmath/CppunitTest_starmath_qa_cppunit.mk starmath/Module_starmath.mk starmath/RdbTarget_starmath_qa_cppunit.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_swdoc_test.mk sw/CppunitTest_sw_test_filters.mk sw/Module_sw.mk sw/RdbTarget_sw_filters_test.mk sw/RdbTarget_sw_swdoc_test.mk writerf ilter/CppunitTest_writerfilter_rtftok.mk writerfilter/Module_writerfilter.mk writerfilter/RdbTarget_writerfilter_rtftok.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Tue Oct 4 10:06:22 PDT 2011
hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 11 -
hwpfilter/Module_hwpfilter.mk | 1
hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk | 44 ++++
i18npool/CppunitTest_i18npool_test_breakiterator.mk | 6
i18npool/Module_i18npool.mk | 1
i18npool/RdbTarget_i18npool_test_breakiterator.mk | 35 +++
lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 6
lotuswordpro/Module_lotuswordpro.mk | 1
lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk | 39 +++
sc/CppunitTest_sc_filters_test.mk | 106 +++++++++
sc/CppunitTest_sc_test_filters.mk | 139 -------------
sc/CppunitTest_sc_ucalc.mk | 14 -
sc/Module_sc.mk | 4
sc/RdbTarget_sc_filters_test.mk | 64 +++++
sc/RdbTarget_sc_ucalc.mk | 46 ++++
sd/CppunitTest_sd_uimpress.mk | 7
sd/Module_sd.mk | 1
sd/RdbTarget_sd_uimpress.mk | 36 +++
solenv/gbuild/RdbTarget.mk | 4
starmath/CppunitTest_starmath_qa_cppunit.mk | 22 --
starmath/Module_starmath.mk | 6
starmath/RdbTarget_starmath_qa_cppunit.mk | 51 ++++
sw/CppunitTest_sw_filters_test.mk | 94 ++++++++
sw/CppunitTest_sw_swdoc_test.mk | 16 -
sw/CppunitTest_sw_test_filters.mk | 116 ----------
sw/Module_sw.mk | 4
sw/RdbTarget_sw_filters_test.mk | 53 ++++
sw/RdbTarget_sw_swdoc_test.mk | 47 ++++
writerfilter/CppunitTest_writerfilter_rtftok.mk | 11 -
writerfilter/Module_writerfilter.mk | 1
writerfilter/RdbTarget_writerfilter_rtftok.mk | 42 +++
31 files changed, 678 insertions(+), 350 deletions(-)
New commits:
commit 266598b810b5325bf8948c01c78438210d21b49e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:33:36 2011 +0200
adapt i18npool unittests to separate RdbTarget makefile requirement
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 28a8c39..5be23d7 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -63,12 +63,6 @@ $(eval $(call gb_CppunitTest_set_args,i18npool_test_breakiterator,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,i18npool_test_breakiterator))
-
-$(eval $(call gb_RdbTarget_add_components,i18npool_test_breakiterator,\
- i18npool/util/i18npool \
-))
-
$(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : $(call gb_Module_get_target,i18npool)
# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 022e85f..8b6947b 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -59,6 +59,7 @@ endif
$(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
+ RdbTarget_i18npool_test_breakiterator \
))
ifeq ($(OS),IOS)
diff --git a/i18npool/RdbTarget_i18npool_test_breakiterator.mk b/i18npool/RdbTarget_i18npool_test_breakiterator.mk
new file mode 100644
index 0000000..994e08e
--- /dev/null
+++ b/i18npool/RdbTarget_i18npool_test_breakiterator.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+
+$(eval $(call gb_RdbTarget_RdbTarget,i18npool_test_breakiterator))
+
+$(eval $(call gb_RdbTarget_add_components,i18npool_test_breakiterator,\
+ i18npool/util/i18npool \
+))
+
+# vim: set noet sw=4 ts=4:
commit 4efbed432d7e04872cc801586d2d2533d573ac00
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:29:57 2011 +0200
add missed file hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk
diff --git a/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk b/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk
new file mode 100644
index 0000000..119439b
--- /dev/null
+++ b/hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_RdbTarget_RdbTarget,hwpfilter_test_hwpfilter))
+
+$(eval $(call gb_RdbTarget_add_components,hwpfilter_test_hwpfilter,\
+ hwpfilter/source/hwp,\
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,hwpfilter_test_hwpfilter,\
+ ucb1 \
+ ucpfile1 \
+))
+
+# vim: set noet sw=4 ts=4:
commit 8a3a108f5e545f667ad2cf8043aa102b347bd2f1
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:28:30 2011 +0200
adapt sd unittests to separate RdbTarget makefile requirement
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 6791a53..69d3b3a 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -95,11 +95,4 @@ $(eval $(call gb_CppunitTest_set_args,sd_uimpress,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,sd_uimpress))
-
-$(eval $(call gb_RdbTarget_add_components,sd_uimpress,\
- framework/util/fwk \
- i18npool/util/i18npool \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index c374fb1..193cba5 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_targets,sd,\
$(eval $(call gb_Module_add_check_targets,sd,\
CppunitTest_sd_uimpress \
+ RdbTarget_sd_uimpress \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
diff --git a/sd/RdbTarget_sd_uimpress.mk b/sd/RdbTarget_sd_uimpress.mk
new file mode 100644
index 0000000..9265695
--- /dev/null
+++ b/sd/RdbTarget_sd_uimpress.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+
+$(eval $(call gb_RdbTarget_RdbTarget,sd_uimpress))
+
+$(eval $(call gb_RdbTarget_add_components,sd_uimpress,\
+ framework/util/fwk \
+ i18npool/util/i18npool \
+))
+
+# vim: set noet sw=4 ts=4:
commit ddf0f4f36f29b0fc360c1d423cd4eb92edf8d3d9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:26:15 2011 +0200
adapt starmath unittests to separate RdbTarget makefile requirement
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 0e73dcc..0adf956 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -92,26 +92,4 @@ $(eval $(call gb_CppunitTest_set_args,starmath_qa_cppunit,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit))
-
-$(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\
- framework/util/fwk \
- i18npool/util/i18npool \
- toolkit/util/tk \
- sfx2/util/sfx \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
- component/vcl/vcl \
- configmgr \
- mcnttype \
-))
-
-ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
- ftransl \
- sysdtrans \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index b3763c2..6da29aa 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -35,6 +35,12 @@ $(eval $(call gb_Module_add_targets,starmath,\
Package_uiconfig \
))
+# was this missing accidentally?
+#$(eval $(call gb_Module_add_check_targets,starmath,\
+ CppunitTest_starmath_qa_cppunit \
+ RdbTarget_starmath_qa_cppunit \
+))
+
$(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
JunitTest_sm_unoapi \
))
diff --git a/starmath/RdbTarget_starmath_qa_cppunit.mk b/starmath/RdbTarget_starmath_qa_cppunit.mk
new file mode 100644
index 0000000..64b7baa
--- /dev/null
+++ b/starmath/RdbTarget_starmath_qa_cppunit.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+
+$(eval $(call gb_RdbTarget_RdbTarget,starmath_qa_cppunit))
+
+$(eval $(call gb_RdbTarget_add_components,starmath_qa_cppunit,\
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ toolkit/util/tk \
+ sfx2/util/sfx \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
+ component/vcl/vcl \
+ configmgr \
+ mcnttype \
+))
+
+ifeq ($(strip $(OS)),WNT)
+$(eval $(call gb_RdbTarget_add_old_components,starmath_qa_cppunit,\
+ ftransl \
+ sysdtrans \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
commit 371c4c8600efd8f1674fafc35b80039b58798e26
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:21:59 2011 +0200
adapt hwpfilter unittests to separate RdbTarget makefile requirement
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 2ac6cc0..01edac8 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -70,17 +70,6 @@ $(eval $(call gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,hwpfilter_test_hwpfilter))
-
-$(eval $(call gb_RdbTarget_add_components,hwpfilter_test_hwpfilter,\
- hwpfilter/source/hwp,\
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,hwpfilter_test_hwpfilter,\
- ucb1 \
- ucpfile1 \
-))
-
# we need to explicitly depend on library hwp because it is not implied
# by a link relation
$(call gb_CppunitTest_get_target,hwpfilter_test_hwpfilter) : $(call gb_Library_get_target,hwp)
diff --git a/hwpfilter/Module_hwpfilter.mk b/hwpfilter/Module_hwpfilter.mk
index 95390e5..b0ebe0b 100644
--- a/hwpfilter/Module_hwpfilter.mk
+++ b/hwpfilter/Module_hwpfilter.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,hwpfilter,\
$(eval $(call gb_Module_add_check_targets,hwpfilter,\
CppunitTest_hwpfilter_test_hwpfilter \
+ RdbTarget_hwpfilter_test_hwpfilter \
))
# vim: set noet sw=4 ts=4:
commit 73000ee8c28b5d53bdf80eb55ba84dbfde7cf462
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:18:54 2011 +0200
adapt writerfilter unittests to separate RdbTarget makefile requirement
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index ed23c47..a863994 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -65,17 +65,6 @@ $(eval $(call gb_CppunitTest_set_args,writerfilter_rtftok,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,writerfilter_rtftok))
-
-$(eval $(call gb_RdbTarget_add_components,writerfilter_rtftok,\
- writerfilter/util/writerfilter \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,writerfilter_rtftok,\
- ucb1 \
- ucpfile1 \
-))
-
# we need to explicitly depend on library rtftok and writerfilter because it is not implied
# by a link relation
$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,rtftok) $(call gb_Library_get_target,writerfilter)
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 83946c2..ac782b5 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_targets,writerfilter,\
$(eval $(call gb_Module_add_check_targets,writerfilter,\
CppunitTest_writerfilter_doctok \
CppunitTest_writerfilter_rtftok \
+ RdbTarget_writerfilter_rtftok \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\
diff --git a/writerfilter/RdbTarget_writerfilter_rtftok.mk b/writerfilter/RdbTarget_writerfilter_rtftok.mk
new file mode 100644
index 0000000..c8055b4
--- /dev/null
+++ b/writerfilter/RdbTarget_writerfilter_rtftok.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Miklos Vajna <vmiklos at frugalware.org>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_RdbTarget_RdbTarget,writerfilter_rtftok))
+
+$(eval $(call gb_RdbTarget_add_components,writerfilter_rtftok,\
+ writerfilter/util/writerfilter \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,writerfilter_rtftok,\
+ ucb1 \
+ ucpfile1 \
+))
+
+# vim: set noet sw=4 ts=4:
commit 417c794fa42ff070b5c767532243830e1b9a9127
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:14:51 2011 +0200
adapt lotuswordpro unittests to separate RdbTarget makefile requirement
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index a1ffb35..66aee34 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -71,12 +71,6 @@ $(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,lotuswordpro_test_lotuswordpro))
-
-$(eval $(call gb_RdbTarget_add_components,lotuswordpro_test_lotuswordpro,\
- lotuswordpro/util/lwpfilter,\
-))
-
# we need to explicitly depend on library lwpft because it is not implied
# by a link relation
$(call gb_CppunitTest_get_target,lotuswordpro_test_lotuswordpro) : $(call gb_Library_get_target,lwpft)
diff --git a/lotuswordpro/Module_lotuswordpro.mk b/lotuswordpro/Module_lotuswordpro.mk
index 1932767..9e756c9 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,lotuswordpro,\
$(eval $(call gb_Module_add_check_targets,lotuswordpro,\
CppunitTest_lotuswordpro_test_lotuswordpro \
+ RdbTarget_lotuswordpro_test_lotuswordpro \
))
# vim: set noet sw=4 ts=4:
diff --git a/lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk
new file mode 100644
index 0000000..8d1f7c6
--- /dev/null
+++ b/lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_RdbTarget_RdbTarget,lotuswordpro_test_lotuswordpro))
+
+$(eval $(call gb_RdbTarget_add_components,lotuswordpro_test_lotuswordpro,\
+ lotuswordpro/util/lwpfilter,\
+))
+
+# vim: set noet sw=4 ts=4:
commit 977ea14f37c4d53668ed89ed79009b1e15fcb8a6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:09:41 2011 +0200
adapt sw unittests to separate RdbTarget makefile requirement
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 6541bf7..720adae 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -87,28 +87,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,sw_filters_test))
-
-$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\
- sw/util/sw \
- sw/util/msword \
- forms/util/frm \
- dbaccess/util/dba \
- sfx2/util/sfx \
- framework/util/fwk \
- toolkit/util/tk \
- unoxml/source/service/unoxml \
- fileaccess/source/fileacc \
- comphelper/util/comphelp \
- i18npool/util/i18npool \
- package/util/package2 \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\
- ucb1 \
- ucpfile1 \
-))
-
# we need to explicitly depend on library msword because it is not implied
# by a link relation
$(call gb_CppunitTest_get_target,sw_filters_test) : $(call gb_Library_get_target,msword)
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index d1ea1d3..aec0096 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -105,22 +105,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,sw_swdoc_test))
-
-$(eval $(call gb_RdbTarget_add_components,sw_swdoc_test,\
- sfx2/util/sfx \
- framework/util/fwk \
- unoxml/source/service/unoxml \
- fileaccess/source/fileacc \
- comphelper/util/comphelp \
- i18npool/util/i18npool \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sw_swdoc_test,\
- ucb1 \
- ucpfile1 \
-))
-
# we need to explicitly depend on the sw resource files needed at unit-test
# runtime
$(call gb_CppunitTest_get_target,sw_swdoc_test) : $(WORKDIR)/AllLangRes/sw
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index c66b92e..90d8a0c 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -43,6 +43,8 @@ $(eval $(call gb_Module_add_targets,sw,\
$(eval $(call gb_Module_add_check_targets,sw,\
CppunitTest_sw_filters_test \
CppunitTest_sw_swdoc_test \
+ RdbTarget_sw_filters_test \
+ RdbTarget_sw_swdoc_test \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
diff --git a/sw/RdbTarget_sw_filters_test.mk b/sw/RdbTarget_sw_filters_test.mk
new file mode 100644
index 0000000..3fdee3c
--- /dev/null
+++ b/sw/RdbTarget_sw_filters_test.mk
@@ -0,0 +1,53 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_RdbTarget_RdbTarget,sw_filters_test))
+
+$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\
+ sw/util/sw \
+ sw/util/msword \
+ forms/util/frm \
+ dbaccess/util/dba \
+ sfx2/util/sfx \
+ framework/util/fwk \
+ toolkit/util/tk \
+ unoxml/source/service/unoxml \
+ fileaccess/source/fileacc \
+ comphelper/util/comphelp \
+ i18npool/util/i18npool \
+ package/util/package2 \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\
+ ucb1 \
+ ucpfile1 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/RdbTarget_sw_swdoc_test.mk b/sw/RdbTarget_sw_swdoc_test.mk
new file mode 100644
index 0000000..34dbdc4
--- /dev/null
+++ b/sw/RdbTarget_sw_swdoc_test.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_RdbTarget_RdbTarget,sw_swdoc_test))
+
+$(eval $(call gb_RdbTarget_add_components,sw_swdoc_test,\
+ sfx2/util/sfx \
+ framework/util/fwk \
+ unoxml/source/service/unoxml \
+ fileaccess/source/fileacc \
+ comphelper/util/comphelp \
+ i18npool/util/i18npool \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sw_swdoc_test,\
+ ucb1 \
+ ucpfile1 \
+))
+
+# vim: set noet sw=4 ts=4:
commit 952e758d47aa7b50a74e4a068723e47c7a8adc7e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 18:01:11 2011 +0200
move sw_test_filters => sw_filters_test for consistency
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
new file mode 100644
index 0000000..6541bf7
--- /dev/null
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -0,0 +1,116 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_filters_test))
+
+ifeq ($(SYSTEM_LIBXML),YES)
+$(eval $(call gb_CppunitTest_add_cxxflags,sw_filters_test,\
+ $(LIBXML_CFLAGS) \
+))
+endif
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \
+ sw/qa/core/filters-test \
+))
+
+$(call gb_CxxObject_get_target,sw/qa/core/filters-test): $(WORKDIR)/AllLangRes/sw
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sw_filters_test, \
+ test \
+ sw \
+ sfx \
+ svl \
+ svt \
+ vcl \
+ tl \
+ ucbhelper \
+ utl \
+ i18nisolang1 \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sw_filters_test,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sw_filters_test))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_service_rdbs,sw_filters_test,\
+ sw_filters_test \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
+ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
+))
+
+$(eval $(call gb_RdbTarget_RdbTarget,sw_filters_test))
+
+$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\
+ sw/util/sw \
+ sw/util/msword \
+ forms/util/frm \
+ dbaccess/util/dba \
+ sfx2/util/sfx \
+ framework/util/fwk \
+ toolkit/util/tk \
+ unoxml/source/service/unoxml \
+ fileaccess/source/fileacc \
+ comphelper/util/comphelp \
+ i18npool/util/i18npool \
+ package/util/package2 \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\
+ ucb1 \
+ ucpfile1 \
+))
+
+# we need to explicitly depend on library msword because it is not implied
+# by a link relation
+$(call gb_CppunitTest_get_target,sw_filters_test) : $(call gb_Library_get_target,msword)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_test_filters.mk b/sw/CppunitTest_sw_test_filters.mk
deleted file mode 100644
index 6541bf7..0000000
--- a/sw/CppunitTest_sw_test_filters.mk
+++ /dev/null
@@ -1,116 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-# 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.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# 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.
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,sw_filters_test))
-
-ifeq ($(SYSTEM_LIBXML),YES)
-$(eval $(call gb_CppunitTest_add_cxxflags,sw_filters_test,\
- $(LIBXML_CFLAGS) \
-))
-endif
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \
- sw/qa/core/filters-test \
-))
-
-$(call gb_CxxObject_get_target,sw/qa/core/filters-test): $(WORKDIR)/AllLangRes/sw
-
-$(eval $(call gb_CppunitTest_add_linked_libs,sw_filters_test, \
- test \
- sw \
- sfx \
- svl \
- svt \
- vcl \
- tl \
- ucbhelper \
- utl \
- i18nisolang1 \
- comphelper \
- cppu \
- cppuhelper \
- sal \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
- -I$(realpath $(SRCDIR)/sw/inc/pch) \
- -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
- -I$(realpath $(SRCDIR)/sw/inc) \
- $$(INCLUDE) \
- -I$(OUTDIR)/inc \
-))
-
-$(eval $(call gb_CppunitTest_add_api,sw_filters_test,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_uses_ure,sw_filters_test))
-
-$(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\
- types \
-))
-
-$(eval $(call gb_CppunitTest_add_service_rdbs,sw_filters_test,\
- sw_filters_test \
-))
-
-$(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
- --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
-))
-
-$(eval $(call gb_RdbTarget_RdbTarget,sw_filters_test))
-
-$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\
- sw/util/sw \
- sw/util/msword \
- forms/util/frm \
- dbaccess/util/dba \
- sfx2/util/sfx \
- framework/util/fwk \
- toolkit/util/tk \
- unoxml/source/service/unoxml \
- fileaccess/source/fileacc \
- comphelper/util/comphelp \
- i18npool/util/i18npool \
- package/util/package2 \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\
- ucb1 \
- ucpfile1 \
-))
-
-# we need to explicitly depend on library msword because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,sw_filters_test) : $(call gb_Library_get_target,msword)
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 67932a8..c66b92e 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_targets,sw,\
))
$(eval $(call gb_Module_add_check_targets,sw,\
- CppunitTest_sw_test_filters \
+ CppunitTest_sw_filters_test \
CppunitTest_sw_swdoc_test \
))
commit 47212814c553a53241e981b49d2037014d5f7a07
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 17:56:26 2011 +0200
adapt sc unittests to separate RdbTarget makefile requirement, also rename sc_test_filters consistent to sc_filters_test
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
new file mode 100644
index 0000000..a164696
--- /dev/null
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -0,0 +1,106 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_filters_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_filters_test, \
+ sc/qa/unit/filters-test \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \
+ test \
+ avmedia \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ fileacc \
+ for \
+ forui \
+ i18nisolang1 \
+ msfilter \
+ oox \
+ sal \
+ salhelper \
+ sb \
+ sc \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vbahelper \
+ vcl \
+ xo \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
+ -I$(realpath $(SRCDIR)/sc/inc/pch) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sc_filters_test,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sc_filters_test))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_service_rdbs,sc_filters_test,\
+ sc_filters_test \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
+ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
+ -env:OOO_CONFIG_REGISTRY_DIR=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) \
+))
+
+# we need to
+# a) explicitly depend on library msword because it is not implied by a link
+# relation
+# b) explicitly depend on the sc resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sc_filters_test) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_test_filters.mk b/sc/CppunitTest_sc_test_filters.mk
deleted file mode 100644
index a2b5693..0000000
--- a/sc/CppunitTest_sc_test_filters.mk
+++ /dev/null
@@ -1,139 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-# 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.
-#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# 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.
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,sc_filters_test))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_filters_test, \
- sc/qa/unit/filters-test \
-))
-
-$(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \
- test \
- avmedia \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- editeng \
- fileacc \
- for \
- forui \
- i18nisolang1 \
- msfilter \
- oox \
- sal \
- salhelper \
- sb \
- sc \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- tk \
- tl \
- ucbhelper \
- utl \
- vbahelper \
- vcl \
- xo \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
- -I$(realpath $(SRCDIR)/sc/inc/pch) \
- -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
- -I$(realpath $(SRCDIR)/sc/inc) \
- $$(INCLUDE) \
- -I$(OUTDIR)/inc \
-))
-
-$(eval $(call gb_CppunitTest_add_api,sc_filters_test,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_uses_ure,sc_filters_test))
-
-$(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
- types \
-))
-
-$(eval $(call gb_CppunitTest_add_service_rdbs,sc_filters_test,\
- sc_filters_test \
-))
-
-$(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
- --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
- -env:OOO_CONFIG_REGISTRY_DIR=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) \
-))
-
-$(eval $(call gb_RdbTarget_RdbTarget,sc_filters_test))
-
-$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
- basic/util/sb \
- comphelper/util/comphelp \
- dbaccess/util/dba \
- fileaccess/source/fileacc \
- filter/source/config/cache/filterconfig1 \
- forms/util/frm \
- framework/util/fwk \
- i18npool/util/i18npool \
- oox/util/oox \
- package/source/xstor/xstor \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
- sax/source/fastparser/fastsax \
- sc/util/sc \
- sc/util/scfilt \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
- sfx2/util/sfx \
- toolkit/util/tk \
- unotools/util/utl \
- unoxml/source/rdf/unordf \
- unoxml/source/service/unoxml \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
- configmgr \
- ucb1 \
- ucpfile1 \
-))
-
-# we need to
-# a) explicitly depend on library msword because it is not implied by a link
-# relation
-# b) explicitly depend on the sc resource files needed at unit-test runtime
-$(call gb_CppunitTest_get_target,sc_filters_test) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 5bd1e5c..08f0ed8 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -102,18 +102,4 @@ $(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
))
-$(eval $(call gb_RdbTarget_RdbTarget,sc_ucalc))
-
-$(eval $(call gb_RdbTarget_add_components,sc_ucalc,\
- framework/util/fwk \
- i18npool/util/i18npool \
- sfx2/util/sfx \
- unoxml/source/service/unoxml \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sc_ucalc,\
- ucb1 \
- ucpfile1 \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 8ecdf25..1edf646 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -35,8 +35,10 @@ $(eval $(call gb_Module_add_targets,sc,\
))
$(eval $(call gb_Module_add_check_targets,sc,\
+ CppunitTest_sc_filters_test \
CppunitTest_sc_ucalc \
- CppunitTest_sc_test_filters \
+ RdbTarget_sc_filters_test \
+ RdbTarget_sc_ucalc \
))
diff --git a/sc/RdbTarget_sc_filters_test.mk b/sc/RdbTarget_sc_filters_test.mk
new file mode 100644
index 0000000..a0d32bb
--- /dev/null
+++ b/sc/RdbTarget_sc_filters_test.mk
@@ -0,0 +1,64 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_RdbTarget_RdbTarget,sc_filters_test))
+
+$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
+ basic/util/sb \
+ comphelper/util/comphelp \
+ dbaccess/util/dba \
+ fileaccess/source/fileacc \
+ filter/source/config/cache/filterconfig1 \
+ forms/util/frm \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ oox/util/oox \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sax/source/fastparser/fastsax \
+ sc/util/sc \
+ sc/util/scfilt \
+ scripting/source/basprov/basprov \
+ scripting/util/scriptframe \
+ sfx2/util/sfx \
+ toolkit/util/tk \
+ unotools/util/utl \
+ unoxml/source/rdf/unordf \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
+ configmgr \
+ ucb1 \
+ ucpfile1 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/RdbTarget_sc_ucalc.mk b/sc/RdbTarget_sc_ucalc.mk
new file mode 100644
index 0000000..c33f4a0
--- /dev/null
+++ b/sc/RdbTarget_sc_ucalc.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+# 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.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+#
+# 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.
+#*************************************************************************
+
+$(eval $(call gb_RdbTarget_RdbTarget,sc_ucalc))
+
+$(eval $(call gb_RdbTarget_add_components,sc_ucalc,\
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ sfx2/util/sfx \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sc_ucalc,\
+ ucb1 \
+ ucpfile1 \
+))
+
+# vim: set noet sw=4 ts=4:
commit ff9dc14034b28492d302a6cbe94a63d308335ddd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Oct 4 17:55:10 2011 +0200
make RdbTarget depend on its makefile
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 0cdcebf..5ced7ed 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -59,7 +59,11 @@ ifeq ($(2),$(true))
$(call gb_RdbTarget_get_outdir_target,$(1)) : $(call gb_RdbTarget_get_target,$(1))
$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_RdbTarget_get_target,$(1)))
endif
+# depend on the last sourced makefile, which should contain the declaration of this target
+# thus, when you change the RdbTarget_*.mk, the target will get rebuild
+$(call gb_RdbTarget_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
+$$(eval $$(call gb_Module_register_target,$(call gb_RdbTarget_get_target,$(1)),$(call gb_RdbTarget_get_clean_target,$(1))))
endef
define gb_RdbTarget_add_component
More information about the Libreoffice-commits
mailing list