[Mesa-dev] [PATCH 04/16] xmlconfig: move into src/util

[Rob Herring]

On Fri, Jun 30, 2017 at 7:45 AM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> ---

[...]

> diff --git a/src/util/Android.mk b/src/util/Android.mk
> index facdcf8..6c81322 100644
> --- a/src/util/Android.mk
> +++ b/src/util/Android.mk
> @@ -24,35 +24,80 @@ LOCAL_PATH := $(call my-dir)
>
>  include $(LOCAL_PATH)/Makefile.sources
>
>  # ---------------------------------------
>  # Build libmesa_util
>  # ---------------------------------------
>
>  include $(CLEAR_VARS)
>
>  LOCAL_SRC_FILES := \
> -       $(MESA_UTIL_FILES)
> +       $(MESA_UTIL_FILES) \
> +       $(XMLCONFIG_FILES)
>
>  LOCAL_C_INCLUDES := \
>         external/zlib \
>         $(MESA_TOP)/src/mesa \
>         $(MESA_TOP)/src/mapi \
>         $(MESA_TOP)/src/gallium/include \
>         $(MESA_TOP)/src/gallium/auxiliary
>
>  LOCAL_MODULE := libmesa_util
>
>  # Generated sources
>
>  LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>
>  intermediates := $(call local-generated-sources-dir)
>  LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
>
> +MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
> +LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H)
> +
> +#
> +# Generate options.h from gettext translations.
> +#
> +
> +MESA_DRI_OPTIONS_LANGS := de es nl fr sv
> +POT := $(intermediates)/xmlpool.pot
> +
> +$(POT): $(LOCAL_PATH)/xmlpool/t_options.h
> +       @mkdir -p $(dir $@)
> +       xgettext -L C --from-code utf-8 -o $@ $<
> +
> +$(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT)
> +       lang=$(basename $(notdir $@)); \
> +       mkdir -p $(dir $@); \
> +       if [ -f $< ]; then \
> +               msgmerge -o $@ $^; \
> +       else \
> +               msginit -i $(POT) \
> +                       -o $@ \
> +                       --locale=$$lang \
> +                       --no-translator; \
> +               sed -i -e 's/charset=.*\\n/charset=UTF-8\\n/' $@; \
> +       fi
> +
> +PRIVATE_SCRIPT := $(LOCAL_PATH)/xmlpool/gen_xmlpool.py
> +PRIVATE_LOCALEDIR := $(intermediates)/xmlpool
> +PRIVATE_TEMPLATE_HEADER := $(LOCAL_PATH)/xmlpool/t_options.h
> +PRIVATE_MO_FILES := $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%/LC_MESSAGES/options.mo)
> +
> +LOCAL_GENERATED_SOURCES += $(PRIVATE_MO_FILES)

I did an Android build of your branch and you should have gotten an
email. The build problem is this makefile already has rules for
$(LOCAL_GENERATED_SOURCES), so rules for $(PRIVATE_MO_FILES) are
getting defined twice.

> +
> +$(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%/LC_MESSAGES/options.mo: $(intermediates)/xmlpool/%.po
> +       mkdir -p $(dir $@)
> +       msgfmt -o $@ $<
> +
>  $(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
>  $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
>  $(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
>         $(transform-generated-source)
>
> +$(PRIVATE_MO_FILES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ $(PRIVATE_TEMPLATE_HEADER) \
> +               $(PRIVATE_LOCALEDIR) $(MESA_DRI_OPTIONS_LANGS) > $@
> +
> +$(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER) $(PRIVATE_MO_FILES)
> +       $(transform-generated-source)
> +
>  include $(MESA_COMMON_MK)
>  include $(BUILD_STATIC_LIBRARY)