<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jun 10, 2016 at 1:16 PM, Emil Velikov <span dir="ltr"><<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On 10 June 2016 at 01:31, Dylan Baker <<a href="mailto:dylan@pnwbakers.com">dylan@pnwbakers.com</a>> wrote:<br>
> This replaces the current bash generator with a python based generator<br>
> using mako. It's quite fast and works with both python 2.7 and python<br>
> 3.5, and should work with 3.3+ and maybe even 3.2.<br>
><br>
> It produces an almost identical file except for a minor layout changes,<br>
> and the addition of a "generated file, do not edit" warning.<br>
><br>
> Signed-off-by: Dylan Baker <<a href="mailto:dylanx.c.baker@intel.com">dylanx.c.baker@intel.com</a>><br>
><br>
> v2: - Provide the python file with the csvfile and output location as<br>
> arguments (Jason, Emil)<br>
> - Put the mako template in the python file (Jason)<br>
> - Merge Emil's Android.mk changes<br>
> ---<br>
> src/intel/isl/Android.mk | 6 +-<br>
> src/intel/isl/Makefile.am | 13 +-<br>
> src/intel/isl/gen_format_layout.py | 207 +++++++++++++++++++++++++++++++<br>
> src/intel/isl/isl_format_layout_gen.bash | 129 -------------------<br>
> 4 files changed, 218 insertions(+), 137 deletions(-)<br>
> create mode 100644 src/intel/isl/gen_format_layout.py<br>
> delete mode 100755 src/intel/isl/isl_format_layout_gen.bash<br>
><br>
> diff --git a/src/intel/isl/Android.mk b/src/intel/isl/Android.mk<br>
> index 3134981..ec3c656 100644<br>
> --- a/src/intel/isl/Android.mk<br>
> +++ b/src/intel/isl/Android.mk<br>
> @@ -139,14 +139,14 @@ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, $(ISL_GENERATED_FILES)<br>
> define bash-gen<br>
> @mkdir -p $(dir $@)<br>
> @echo "Gen Bash: $(PRIVATE_MODULE) <= $(notdir $(@))"<br>
> - $(hide) $(PRIVATE_SCRIPT) < $(PRIVATE_CSV) > $@<br>
> + $(hide) $(PRIVATE_SCRIPT) --csv $(PRIVATE_CSV) --out $(ISL_GENERATED_FILES)<br>
> endef<br>
><br>
> isl_format_layout_deps := \<br>
> - $(LOCAL_PATH)/isl_format_layout_gen.bash \<br>
> + $(LOCAL_PATH)/gen_format_layout.py \<br>
> $(LOCAL_PATH)/isl_format_layout.csv<br>
><br>
> -$(intermediates)/isl_format_layout.c: PRIVATE_SCRIPT := bash -c $(LOCAL_PATH)/isl_format_layout_gen.bash<br>
> +$(intermediates)/isl_format_layout.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/gen_format_layout.py<br>
> $(intermediates)/isl_format_layout.c: PRIVATE_CSV := $(LOCAL_PATH)/isl_format_layout.csv<br>
> $(intermediates)/isl_format_layout.c: $(isl_format_layout_deps)<br>
> $(call bash-gen)<br>
> diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am<br>
> index 74f863a..8142932 100644<br>
> --- a/src/intel/isl/Makefile.am<br>
> +++ b/src/intel/isl/Makefile.am<br>
> @@ -1,4 +1,4 @@<br>
> -# Copyright 2015 Intel Corporation<br>
> +# Copyright 2015-2016 Intel Corporation<br>
> #<br>
> # Permission is hereby granted, free of charge, to any person obtaining a<br>
> # copy of this software and associated documentation files (the "Software"),<br>
> @@ -66,10 +66,13 @@ libisl_gen9_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=90<br>
><br>
> BUILT_SOURCES = $(ISL_GENERATED_FILES)<br>
><br>
> -isl_format_layout.c: isl_format_layout_gen.bash \<br>
> +PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)<br>
> +<br>
> +isl_format_layout.c: gen_format_layout.py \<br>
> isl_format_layout.csv<br>
> - $(AM_V_GEN)$(srcdir)/isl_format_layout_gen.bash \<br>
> - <$(srcdir)/isl_format_layout.csv >$@<br>
> + $(PYTHON_GEN) $(srcdir)/gen_format_layout.py \<br>
> + --csv $(srcdir)/isl_format_layout.csv \<br>
> + --out $(srcdir)/isl_format_layout.c<br>
</div></div>I'm thinking that this should be builddir/isl_format_layout.c. Then<br>
again one could/should use $@ in the first place. Both here and in the<br>
Android case.<br></blockquote><div><br></div><div>We usually use builddir in the autotools at least as far as I know.<br><br></div><div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br><br></div><div>Feel free to CC stable. It's not a bugfix but if we have to backport patches to stable, it'll be much easier w/o a bash generator.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Regardless of which option you go for builddir/... or $@ the patch is<br>
Reviewed-by: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br>
<span class="HOEnZb"><font color="#888888"><br>
-Emil<br>
</font></span><div class="HOEnZb"><div class="h5">_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</div></div></blockquote></div><br></div></div>