diff options
| author | Samuel Thibault <sthibault@hypra.fr> | 2018-02-21 15:51:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-28 22:54:21 +0100 |
| commit | 84ef6d82546b044990f4efd57e51e29c6c6565c8 (patch) | |
| tree | 8f6d9e140c2d3731bb4a44eb58d09e359ab33ca6 /solenv/gbuild/UIConfig.mk | |
| parent | e215310d6b531b8af39c86639ef88495470681bc (diff) | |
Build external lxml if not provided by system
except on windows, where gla11y will resort to python's internal xml parser,
which does not provide line numbers.
This allows gla11y to be runnable on all systems.
Change-Id: Ica4eb90f59bddfcefd783fc2ed9c8c27357e7572
Reviewed-on: https://gerrit.libreoffice.org/50115
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild/UIConfig.mk')
| -rw-r--r-- | solenv/gbuild/UIConfig.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index e7de81a25839..0de62d712009 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -94,7 +94,11 @@ endef # * UIConfig/<name> containing all nontranslatable files gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg -gb_UIConfig_a11yerrors_COMMAND = $(PYTHON_FOR_BUILD) $(SRCDIR)/bin/gla11y + +ifneq ($(filter LXML,$(BUILD_TYPE)),) +gb_UIConfig_LXML_PATH := PYPATH=$${PYPATH:+$$PYPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install ; +endif +gb_UIConfig_gla11y_SCRIPT := $(SRCDIR)/bin/gla11y $(dir $(call gb_UIConfig_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) @@ -122,17 +126,11 @@ $(call gb_UIConfig_get_clean_target,%) : define gb_UIConfig_a11yerrors__command $(call gb_Output_announce,$(2),$(true),UIA,1) -$(call gb_Helper_abbreviate_dirs,\ - $(gb_UIConfig_a11yerrors_COMMAND) -W none $(UIFILES) > $@ -) +$(call gb_UIConfig__gla11y_command) endef -$(call gb_UIConfig_get_a11yerrors_target,%) : $(gb_UIConfig_a11yerrors_COMMAND) -ifeq ($(PYTHON_LXML),TRUE) +$(call gb_UIConfig_get_a11yerrors_target,%) : $(call gb_ExternalProject_get_target,lxml) $(call gb_ExternalExecutable_get_dependencies,python) $(gb_UIConfig_gla11y_SCRIPT) $(call gb_UIConfig_a11yerrors__command,$@,$*) -else - touch $@ -endif gb_UIConfig_get_packagename = UIConfig/$(1) gb_UIConfig_get_packagesetname = UIConfig/$(1) @@ -186,7 +184,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 += $(SRCDIR)/$(2).ui +$(call gb_UIConfig_get_a11yerrors_target,$(1)) : UIFILES += $(2).ui endef |