Kaydet (Commit) 5dce2725 authored tarafından Matúš Kukan's avatar Matúš Kukan

move dependency on localedata_en to i18npool

üst 62640a84
......@@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,dbaccess_macros_test,\
))
# 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
# - explicitly depend on the dbaccess resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,dbaccess_macros_test) : \
$(WORKDIR)/AllLangRes/dbaccess \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -148,4 +148,13 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
CustomTarget/i18npool/breakiterator/$(notdir $(basename $(txt)))_brk) \
))
# i18npool dlopens localedata_* libraries.
# This is runtime dependency to prevent tests
# to be run sooner then localedata_* exists.
$(call gb_Library_get_target,i18npool) : \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,localedata_es) \
$(call gb_Library_get_target,localedata_euro) \
$(call gb_Library_get_target,localedata_others) \
# vim: set noet sw=4 ts=4:
......@@ -128,11 +128,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -135,11 +135,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_chart_regression_test,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_chart_regression_test) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_databaserangeobj) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilotfieldobj,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_datapilotfieldobj) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilottableobj,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_datapilottableobj) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -123,11 +123,8 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_filters_test) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -124,11 +124,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_macros_test,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_macros_test) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangeobj,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_namedrangeobj) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangesobj,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_namedrangesobj) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -136,11 +136,8 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_subsequent_filters_test) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -127,11 +127,8 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sc_tableautoformatfield,\
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sc resource files needed at unit-test runtime
# - explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_tableautoformatfield) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -40,8 +40,6 @@ $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
$(WORKDIR)/AllLangRes/forui \
$(WORKDIR)/AllLangRes/frm \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
avmedia \
......
......@@ -95,9 +95,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
$(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
# we need to explicitly depend on library localedata_en because it is not implied
# by a link relation
$(call gb_CppunitTest_get_target,sw_filters_test) : \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -123,11 +123,4 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_layout_test,\
$(OUTDIR)/unittest/registry \
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sw resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sw_layout_test) : \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -125,11 +125,4 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_macros_test,\
$(OUTDIR)/unittest/registry \
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sw resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sw_macros_test) : \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -125,11 +125,4 @@ $(eval $(call gb_CppunitTest_use_extra_configuration,sw_regression_test,\
$(OUTDIR)/unittest/registry \
))
# we need to
# a) explicitly depend on library localedata_en because it is not implied by a link
# relation
# b) explicitly depend on the sw resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sw_regression_test) : \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
......@@ -106,6 +106,5 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_swdoc_test))
$(call gb_CppunitTest_get_target,sw_swdoc_test) : \
$(WORKDIR)/AllLangRes/sw \
$(call gb_AllLangResTarget_get_target,sw) \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment