diff options
| author | Samuel Thibault <sthibault@hypra.fr> | 2018-03-01 13:16:12 +0100 |
|---|---|---|
| committer | jan iversen <jani@libreoffice.org> | 2018-03-01 14:44:46 +0100 |
| commit | e85b8efafc715f2bf3e240f24617dc1d6aa46d4f (patch) | |
| tree | 7808453fb1db8f1bfab1e50255a9e565bea204c5 /solenv/gbuild | |
| parent | 51291f2352976b2f875197de83486a74795e86a3 (diff) | |
gla11y: fix build outside source
We need to pass the absolute path to gla11y for build outside source to
work. We however do not want to expose absolute paths in suppression files,
so we have to introduce a parameter that provides the common prefix to be
stripped.
Change-Id: Iaf652cb8d6c3646438f828a0949dfd811f964e77
Reviewed-on: https://gerrit.libreoffice.org/50568
Reviewed-by: jan iversen <jani@libreoffice.org>
Tested-by: jan iversen <jani@libreoffice.org>
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/UIConfig.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index a0d8974fffe9..c5a04e33ab56 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -190,7 +190,7 @@ $(call gb_UIConfig_get_imagelist_target,$(1)) : UI_IMAGELISTS += $(call gb_UIIma $(call gb_UIConfig_get_imagelist_target,$(1)) : $(call gb_UIImageListTarget_get_target,$(2)) $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UIImageListTarget_get_clean_target,$(2)) -$(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(2).ui +$(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(SRCDIR)/$(2).ui endef diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 3345c7f6cca3..6d5393d2fad9 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -159,7 +159,7 @@ define gb_UIConfig__gla11y_command $(call gb_Helper_abbreviate_dirs,\ $(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \ $(call gb_ExternalExecutable_get_command,python) \ - $(gb_UIConfig_gla11y_SCRIPT) -s $(UI_A11YSUPPRS) $(GEN_A11Y_SUPPRS) -o $@ $(UIFILES) + $(gb_UIConfig_gla11y_SCRIPT) -s $(UI_A11YSUPPRS) $(GEN_A11Y_SUPPRS) -P $(SRCDIR)/ -o $@ $(UIFILES) ) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 467d27cbc529..0a1cdab314ac 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -583,7 +583,7 @@ $(call gb_Helper_abbreviate_dirs,\ FILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \ $(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \ $(call gb_ExternalExecutable_get_command,python) \ - $(gb_UIConfig_gla11y_SCRIPT) -s $(UI_A11YSUPPRS) $(GEN_A11Y_SUPPRS) -o $@ -L $$FILES + $(gb_UIConfig_gla11y_SCRIPT) -s $(UI_A11YSUPPRS) $(GEN_A11Y_SUPPRS) -P $(SRCDIR)/ -o $@ -L $$FILES ) endef |