diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-11 16:24:35 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-12 20:53:14 +0200 |
commit | 5dce272584cc79da727bdd4887d60cec04cbce11 (patch) | |
tree | b7b63d5565de229102420e9028422d55a791aa2f | |
parent | German comment translation for odk folder (diff) | |
download | core-5dce272584cc79da727bdd4887d60cec04cbce11.tar.gz core-5dce272584cc79da727bdd4887d60cec04cbce11.zip |
move dependency on localedata_en to i18npool
-rw-r--r-- | dbaccess/CppunitTest_dbaccess_macros_test.mk | 5 | ||||
-rw-r--r-- | i18npool/Library_i18npool.mk | 9 | ||||
-rw-r--r-- | sc/CppunitTest_sc_cellrangeobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_chart_regression_test.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_databaserangeobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_datapilotfieldobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_datapilottableobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_filters_test.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_macros_test.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_namedrangeobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_namedrangesobj.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_subsequent_filters_test.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_tableautoformatfield.mk | 5 | ||||
-rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 2 | ||||
-rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 5 | ||||
-rw-r--r-- | sw/CppunitTest_sw_layout_test.mk | 7 | ||||
-rw-r--r-- | sw/CppunitTest_sw_macros_test.mk | 7 | ||||
-rw-r--r-- | sw/CppunitTest_sw_regression_test.mk | 7 | ||||
-rw-r--r-- | sw/CppunitTest_sw_swdoc_test.mk | 1 |
19 files changed, 21 insertions, 77 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 2d48691301d5..0f6e9de26ec4 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -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: diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index 5ba850beca5d..96ac0c889e3a 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -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: diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 5a66fd0fee18..78e4aa0e6da0 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -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: diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 2c28e5a0c189..603c2d9957cc 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -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: diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index a519a3992456..2374d97cce34 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -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: diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 9fc3ec705a0a..57286e14b693 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -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: diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 2a07ad591e26..55324fd6bb6e 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -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: diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index e186aac24209..df24d1585e69 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -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: diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index f3d766074c18..c503a0471069 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -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: diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index d71144ce143f..94118944e8c6 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -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: diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index da8368292854..048002ecf6ef 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -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: diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 990d51910eae..f52ca4180dfe 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -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: diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index c210d51d626a..2e69600facd0 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -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: diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index f949078b40c1..a44f9292ba98 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -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 \ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index a858d3ed69d1..6a91e04c44c2 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -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: diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 8b7587f76498..1d97f48c223b 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -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: diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index b1e537594c92..bd754e9db2e4 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -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: diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index ca0f9a69dba3..4712e00e10b6 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -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: diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 5c32a9a29b65..7f157837d683 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -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: |