[Libreoffice-commits] .: 3 commits - Module_tail_build.mk dbaccess/CppunitTest_dbaccess_macros_test.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sd/CppunitTest_sd_regression_test.mk solenv/gbuild sw/CppunitTest_sw_layout_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_regression_test.mk sw/CppunitTest_sw_subsequent_odfexport.mk sw/CppunitTest_sw_subsequent_odfimport.mk sw/CppunitTest_sw_subsequent_ooxmlexport.mk sw/CppunitTest_sw_subsequent_ooxmlimport.mk sw/CppunitTest_sw_subsequent_rtfexport.mk sw /CppunitTest_sw_subsequent_rtfimport.mk sw/CppunitTest_sw_subsequent_ww8export.mk sw/CppunitTest_sw_subsequent_ww8import.mk
Michael Stahl
mst at kemper.freedesktop.org
Fri Aug 10 03:12:38 PDT 2012
Module_tail_build.mk | 2 ++
dbaccess/CppunitTest_dbaccess_macros_test.mk | 4 +---
sc/CppunitTest_sc_annotationshapeobj.mk | 4 +---
sc/CppunitTest_sc_cellrangeobj.mk | 4 +---
sc/CppunitTest_sc_chart_regression_test.mk | 4 +---
sc/CppunitTest_sc_databaserangeobj.mk | 4 +---
sc/CppunitTest_sc_datapilotfieldobj.mk | 4 +---
sc/CppunitTest_sc_datapilottableobj.mk | 4 +---
sc/CppunitTest_sc_editfieldobj_cell.mk | 4 +---
sc/CppunitTest_sc_editfieldobj_header.mk | 4 +---
sc/CppunitTest_sc_macros_test.mk | 4 +---
sc/CppunitTest_sc_namedrangeobj.mk | 4 +---
sc/CppunitTest_sc_namedrangesobj.mk | 4 +---
sc/CppunitTest_sc_tableautoformatfield.mk | 4 +---
sc/CppunitTest_sc_tablesheetobj.mk | 4 +---
sc/CppunitTest_sc_tablesheetsobj.mk | 4 +---
sd/CppunitTest_sd_regression_test.mk | 4 +---
solenv/gbuild/CppunitTest.mk | 9 +++++++--
sw/CppunitTest_sw_layout_test.mk | 4 +---
sw/CppunitTest_sw_macros_test.mk | 4 +---
sw/CppunitTest_sw_regression_test.mk | 4 +---
sw/CppunitTest_sw_subsequent_odfexport.mk | 4 +---
sw/CppunitTest_sw_subsequent_odfimport.mk | 4 +---
sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 4 +---
sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 4 +---
sw/CppunitTest_sw_subsequent_rtfexport.mk | 4 +---
sw/CppunitTest_sw_subsequent_rtfimport.mk | 4 +---
sw/CppunitTest_sw_subsequent_ww8export.mk | 4 +---
sw/CppunitTest_sw_subsequent_ww8import.mk | 4 +---
29 files changed, 36 insertions(+), 83 deletions(-)
New commits:
commit 0354d5a202ed68fd0670ed07d54bd7085a88c74b
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 10 12:04:53 2012 +0200
gbuild: detect calls to removed gb_CppunitTest_use_extra_configuration
Change-Id: I8a5e8594e5af04bb4b40b900720ecdd7431788f6
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 49bc472..feaec22 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -280,6 +280,10 @@ $(call gb_CppunitTest__use_configuration,$(1),module,$(gb_Configuration_registry
endef
+define gb_CppunitTest_use_extra_configuration
+$$(call gb_Output_error,gb_CppunitTest_use_extra_configuration: use gb_CppunitTest_use_unittest_configuration instead.))
+endef
+
# Use configuration in $(OUTDIR)/unittest/registry.
define gb_CppunitTest_use_unittest_configuration
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest)
commit 7530303bf9aeadf5423dcf1c78128a458a9588ba
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Aug 9 16:08:37 2012 +0200
gbuild: missing dep on $(OUTDIR)/unittest/registry for tests
Change-Id: Ic80f57946e7b3f9c1bd99ed65955cf3c280063d2
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 0f6e9de..1b7c4b4 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_macros_test))
-$(eval $(call gb_CppunitTest_use_extra_configuration,dbaccess_macros_test,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_macros_test))
# we need to
# - explicitly depend on the dbaccess resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk
index b298628..cbffc92 100644
--- a/sc/CppunitTest_sc_annotationshapeobj.mk
+++ b/sc/CppunitTest_sc_annotationshapeobj.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_annonationshapeobj))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annonationshapeobj))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_annonationshapeobj,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annonationshapeobj))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index 78e4aa0..17e5f27 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -123,9 +123,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_cellrangesbase))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_cellrangesbase))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_cellrangesbase))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 3e3d580..f27fb2f 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -128,9 +128,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_chart_regression_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_chart_regression_test))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_chart_regression_test,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_chart_regression_test))
$(eval $(call gb_CppunitTest_use_external,sc_chart_regression_test,libxml2))
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 2374d97..606c205 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_databaserangeobj))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_databaserangeobj))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 57286e1..5031a8b 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilotfieldobj))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilotfieldobj,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilotfieldobj))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 55324fd..2f5b11d 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilottableobj))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilottableobj,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilottableobj))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk
index 70ca94c..a3604a4 100644
--- a/sc/CppunitTest_sc_editfieldobj_cell.mk
+++ b/sc/CppunitTest_sc_editfieldobj_cell.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_cell))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_cell))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_editfieldobj_cell,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_cell))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk
index 301c8f0..85235b7 100644
--- a/sc/CppunitTest_sc_editfieldobj_header.mk
+++ b/sc/CppunitTest_sc_editfieldobj_header.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_header))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_header))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_editfieldobj_header,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_header))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 7d1a8fb..a19403f 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -120,9 +120,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_macros_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_macros_test))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_macros_test,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_macros_test))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 9411894..bb1f691 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangeobj))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangeobj))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangeobj,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangeobj))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 048002e..4cd080f 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangesobj))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangesobj,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangesobj))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 2e69600..8be35a4 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_tableautoformatfield))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tableautoformatfield))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_tableautoformatfield,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tableautoformatfield))
# we need to
# - explicitly depend on the sc resource files needed at unit-test runtime
diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index fdb230a..f2e7c52 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -123,9 +123,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetobj))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_spreadsheetobj))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetobj,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_spreadsheetobj))
# we need to explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(WORKDIR)/AllLangRes/sc
diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index 9c58bc2..5ef9a01 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_spreadsheetsobj))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_spreadsheetsobj))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetsobj,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_spreadsheetsobj))
# we need to explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(WORKDIR)/AllLangRes/sc
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index 56b480a..af34ec5 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -124,9 +124,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sd_regression_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sd_regression_test))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sd_regression_test,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_regression_test))
$(eval $(call gb_CppunitTest_add_arguments,sd_regression_test,\
"-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 190e40b..49bc472 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -280,9 +280,10 @@ $(call gb_CppunitTest__use_configuration,$(1),module,$(gb_Configuration_registry
endef
-# Use extra configuration dir(s).
-define gb_CppunitTest_use_extra_configuration
-$(foreach extra,$(2),$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(extra)))
+# Use configuration in $(OUTDIR)/unittest/registry.
+define gb_CppunitTest_use_unittest_configuration
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest)
+$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(OUTDIR)/unittest/registry)
endef
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index 1d97f48..6d0b024 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -119,8 +119,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_layout_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_layout_test))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_layout_test,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_layout_test))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index bd754e9..c8d94e7 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -121,8 +121,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_macros_test))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_macros_test,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_macros_test))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index 4712e00..d4e28d6 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -121,8 +121,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_regression_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_regression_test))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_regression_test,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_regression_test))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk
index 21739e7..a59be40 100644
--- a/sw/CppunitTest_sw_subsequent_odfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfexport.mk
@@ -91,8 +91,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfexport))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odfexport,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfexport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk
index 84ee9f7..cba3ebd 100644
--- a/sw/CppunitTest_sw_subsequent_odfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfimport.mk
@@ -90,8 +90,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfimport))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odfimport,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfimport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
index 4e63fb4..eafc644 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
@@ -95,8 +95,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlexport))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlexport))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmlexport,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlexport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
index 8e5e3ef..2fb7c3f 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
@@ -92,8 +92,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlimport))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlimport))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmlimport,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlimport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk
index a0dd451..fb787a3 100644
--- a/sw/CppunitTest_sw_subsequent_rtfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk
@@ -92,8 +92,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfexport))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfexport))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtfexport,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfexport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk
index 33b2303..f3670d5 100644
--- a/sw/CppunitTest_sw_subsequent_rtfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk
@@ -88,8 +88,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfimport))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfimport))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtfimport,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfimport))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk
index 379091a..687ef94 100644
--- a/sw/CppunitTest_sw_subsequent_ww8export.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8export.mk
@@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8export))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8export,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8export))
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk
index cb70e39..24d3e50 100644
--- a/sw/CppunitTest_sw_subsequent_ww8import.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8import.mk
@@ -88,8 +88,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8import))
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8import,\
- $(OUTDIR)/unittest/registry \
-))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8import))
# vim: set noet sw=4 ts=4:
commit f18357810e5e4c2d24d76aedea1ffe8dd6947826
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Aug 9 10:35:24 2012 +0200
do not serialize tail_build unless there is 'all' target
Otherwise running 'make <module>.all' is broken.
Change-Id: Id987d9aefbcfff6fba5f18a04c30f9a2f58ad00b
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 38b795d..ac29fda 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -172,6 +172,7 @@ $(if $(strip $(1)),\
$(call tailbuild_serialize,$(wordlist 2,$(words $(1)),$(1))))
endef
+ifeq (all,$(filter all,$(MAKECMDGOALS)))
$(eval $(call tailbuild_serialize,\
scfilt \
$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
@@ -181,5 +182,6 @@ $(eval $(call tailbuild_serialize,\
$(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \
vcl xo \
))
+endif
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list