solenv/gbuild/TargetLocations.mk | 1 -
solenv/gbuild/UIConfig.mk | 8 ++------
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit b7e8ae27f85aea1e924a28c7facfd82289b9e6a9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Feb 22 09:46:07 2018 +0100
Fix clean-up of gb_UIConfig_get_a11yerrors_target
The old code tried to remove non-exisiting *.a11yerrors files corresponding
to a
UIConfig's individual *.ui files, not the one single *.a11yerrors file
corresponding to the UIConfig itself.
Also, there's no need to have a UIA11YErrorsTarget merely for clean-up.
Just
do that clean-up as part of gb_UIConfig_get_clean_target.
Change-Id: I6676f08496254398801bb75172c1326d1c843071
Reviewed-on: https://gerrit.libreoffice.org/50156
Reviewed-by: Samuel Thibault <sthiba...@hypra.fr>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 06ec8bea0f43..4911b1b8c137 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -281,7 +281,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
CppunitTestFakeExecutable \
CustomTarget \
ExternalProject \
- UIA11YErrorsTarget \
UIConfig \
UIImageListTarget \
UIMenubarTarget \
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 458d426ce413..e7de81a25839 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -117,6 +117,8 @@ $(call gb_UIConfig_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UIConfig_get_target,$*) $(call
gb_UIConfig_get_imagelist_target,$*) \
)
+ $(call gb_Output_announce,$*,$(false),UIA,2)
+ rm -f $(call gb_UIConfig_get_a11yerrors_target,$*)
define gb_UIConfig_a11yerrors__command
$(call gb_Output_announce,$(2),$(true),UIA,1)
@@ -132,11 +134,6 @@ else
touch $@
endif
-.PHONY : $(call gb_UIA11YErrorsTarget_get_clean_target,%)
-$(call gb_UIA11YErrorsTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),UIA,2)
- rm -f $(call gb_UIConfig_get_a11yerrors_target,$*)
-
gb_UIConfig_get_packagename = UIConfig/$(1)
gb_UIConfig_get_packagesetname = UIConfig/$(1)
@@ -190,7 +187,6 @@ $(call gb_UIConfig_get_imagelist_target,$(1)) : $(call
gb_UIImageListTarget_get_
$(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_clean_target,$(1)) : $(call
gb_UIA11YErrorsTarget_get_clean_target,$(2))
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
