Re: [Spice-devel] [PATCH spice-common 3/9] codegen: Generate headers while generating code
On Fri, Mar 08, 2019 at 04:42:24PM -0500, Frediano Ziglio wrote: > > > > > > Bit unsure about the option name. --header-name maybe? Or just infer it > > from the .c file name? > > > > It's similar to --generate-enums and similars. Yes, on the other end this > option is an additional generation and has a parameter so it not a big > match indeed. The infer of the header is a good suggestion. > Maybe a --generate-also-header ? I don't like the -also- ;) I don't think it's worth debating the name for ages, if --generate-header is good for you, let's go for it for consistency with --generate-enus & friends (which I did not notice before). Christophe signature.asc Description: PGP signature ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-common 3/9] codegen: Generate headers while generating code
> > On Sun, Mar 03, 2019 at 07:10:24PM +, Frediano Ziglio wrote: > > Python script generates code and header together however allowed > > to save only one of them. > > Allows to save both of them together to reduce number of time > > we call Python script. > > > > Signed-off-by: Frediano Ziglio > > --- > > common/Makefile.am | 16 ++-- > > common/client_marshallers.h | 2 +- > > common/meson.build | 19 +++ > > spice_codegen.py| 12 ++-- > > 4 files changed, 32 insertions(+), 17 deletions(-) > > > > diff --git a/common/Makefile.am b/common/Makefile.am > > index 3318009..3da5bad 100644 > > --- a/common/Makefile.am > > +++ b/common/Makefile.am > > @@ -112,21 +112,17 @@ MARSHALLERS_DEPS = > > \ > > generated_client_demarshallers.c: $(top_srcdir)/spice.proto > > $(MARSHALLERS_DEPS) > > $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > > --generate-demarshallers --client --include common/messages.h $< $@ > > >/dev/null > > > > -generated_client_marshallers.h: $(top_srcdir)/spice.proto > > $(MARSHALLERS_DEPS) > > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > > --generate-marshallers -P --client --include common/messages.h -H $< $@ > > >/dev/null > > - > > -generated_client_marshallers.c: $(top_srcdir)/spice.proto > > $(MARSHALLERS_DEPS) > > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > > --generate-marshallers -P --include client_marshallers.h --client $< $@ > > >/dev/null > > +generated_client_marshallers.c generated_client_marshallers.h: > > $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) > > + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > > --generate-marshallers -P --include client_marshallers.h --client \ > > + --generated-header generated_client_marshallers.h $< $@ >/dev/null > > > > generated_server_demarshallers.c: $(top_srcdir)/spice.proto > > $(MARSHALLERS_DEPS) > > $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > > --generate-demarshallers --server --include common/messages.h $< $@ > > >/dev/null > > > > STRUCTS = -M String -M Rect -M Point -M DisplayBase -M Fill -M Opaque -M > > Copy -M Blend -M Blackness -M Whiteness -M Invers -M Rop3 -M Stroke -M > > Text -M Transparent -M AlphaBlend -M Composite > > -generated_server_marshallers.c: $(top_srcdir)/spice.proto > > $(MARSHALLERS_DEPS) > > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > > --generate-marshallers $(STRUCTS) --server --include common/messages.h $< > > $@ >/dev/null > > - > > -generated_server_marshallers.h: $(top_srcdir)/spice.proto > > $(MARSHALLERS_DEPS) > > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > > --generate-marshallers $(STRUCTS) --server --include common/messages.h -H > > $< $@ >/dev/null > > +generated_server_marshallers.c generated_server_marshallers.h: > > $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) > > + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > > --generate-marshallers $(STRUCTS) --server --include common/messages.h \ > > +--generated-header generated_server_marshallers.h $< $@ >/dev/null > > > > EXTRA_DIST = \ > > $(CLIENT_MARSHALLERS) \ > > diff --git a/common/client_marshallers.h b/common/client_marshallers.h > > index f082934..b67b98e 100644 > > --- a/common/client_marshallers.h > > +++ b/common/client_marshallers.h > > @@ -21,9 +21,9 @@ > > > > #include > > > > +#include "messages.h" > > #include "common/generated_client_marshallers.h" > > #include "marshaller.h" > > -#include "messages.h" > > Is this hunk intentionally in this patch? > Yes, the --include parameters are the same so now both header and source includes client_marshallers.h. > > > > SPICE_BEGIN_DECLS > > > > diff --git a/common/meson.build b/common/meson.build > > index 156297b..9575568 100644 > > --- a/common/meson.build > > +++ b/common/meson.build > > @@ -65,8 +65,14 @@ spice_common_dep = declare_dependency(link_with : > > spice_common_lib, > > if spice_common_generate_client_code > >targets = [ > > ['client_demarshallers', spice_proto, > > 'generated_client_demarshallers.c', ['--generate-demarshallers', > > '--client', '--include', 'common/messages.h', '@INPUT@', > > '@OUTPUT@']], > > -['client_marshalers', spice_proto, 'generated_client_marshallers.c', > > ['--generate-marshallers', '-P', '--client', '--include', > > 'client_marshallers.h', '@INPUT@', '@OUTPUT@']], > > -['client_marshallers_h', spice_proto, > > 'generated_client_marshallers.h', ['--generate-marshallers', '-P', > > '--client', '--include', 'common/messages.h', '-H', '@INPUT@', > > '@OUTPUT@']], > > +['client_marshallers', spice_proto, > > + ['generated_client_marshallers.c', > > 'generated_client_marshallers.h'], > > + ['--generate-marshallers', > > +'-P', '--client', '--include', 'client_marshallers.h', > > +
Re: [Spice-devel] [PATCH spice-common 3/9] codegen: Generate headers while generating code
On Sun, Mar 03, 2019 at 07:10:24PM +, Frediano Ziglio wrote: > Python script generates code and header together however allowed > to save only one of them. > Allows to save both of them together to reduce number of time > we call Python script. > > Signed-off-by: Frediano Ziglio > --- > common/Makefile.am | 16 ++-- > common/client_marshallers.h | 2 +- > common/meson.build | 19 +++ > spice_codegen.py| 12 ++-- > 4 files changed, 32 insertions(+), 17 deletions(-) > > diff --git a/common/Makefile.am b/common/Makefile.am > index 3318009..3da5bad 100644 > --- a/common/Makefile.am > +++ b/common/Makefile.am > @@ -112,21 +112,17 @@ MARSHALLERS_DEPS = > \ > generated_client_demarshallers.c: $(top_srcdir)/spice.proto > $(MARSHALLERS_DEPS) > $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-demarshallers --client --include common/messages.h $< $@ >/dev/null > > -generated_client_marshallers.h: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers -P --client --include common/messages.h -H $< $@ > >/dev/null > - > -generated_client_marshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers -P --include client_marshallers.h --client $< $@ > >/dev/null > +generated_client_marshallers.c generated_client_marshallers.h: > $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) > + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers -P --include client_marshallers.h --client \ > + --generated-header generated_client_marshallers.h $< $@ >/dev/null > > generated_server_demarshallers.c: $(top_srcdir)/spice.proto > $(MARSHALLERS_DEPS) > $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-demarshallers --server --include common/messages.h $< $@ >/dev/null > > STRUCTS = -M String -M Rect -M Point -M DisplayBase -M Fill -M Opaque -M > Copy -M Blend -M Blackness -M Whiteness -M Invers -M Rop3 -M Stroke -M Text > -M Transparent -M AlphaBlend -M Composite > -generated_server_marshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers $(STRUCTS) --server --include common/messages.h $< $@ > >/dev/null > - > -generated_server_marshallers.h: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) > - $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers $(STRUCTS) --server --include common/messages.h -H $< > $@ >/dev/null > +generated_server_marshallers.c generated_server_marshallers.h: > $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) > + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py > --generate-marshallers $(STRUCTS) --server --include common/messages.h \ > +--generated-header generated_server_marshallers.h $< $@ >/dev/null > > EXTRA_DIST = \ > $(CLIENT_MARSHALLERS) \ > diff --git a/common/client_marshallers.h b/common/client_marshallers.h > index f082934..b67b98e 100644 > --- a/common/client_marshallers.h > +++ b/common/client_marshallers.h > @@ -21,9 +21,9 @@ > > #include > > +#include "messages.h" > #include "common/generated_client_marshallers.h" > #include "marshaller.h" > -#include "messages.h" Is this hunk intentionally in this patch? > > SPICE_BEGIN_DECLS > > diff --git a/common/meson.build b/common/meson.build > index 156297b..9575568 100644 > --- a/common/meson.build > +++ b/common/meson.build > @@ -65,8 +65,14 @@ spice_common_dep = declare_dependency(link_with : > spice_common_lib, > if spice_common_generate_client_code >targets = [ > ['client_demarshallers', spice_proto, > 'generated_client_demarshallers.c', ['--generate-demarshallers', '--client', > '--include', 'common/messages.h', '@INPUT@', '@OUTPUT@']], > -['client_marshalers', spice_proto, 'generated_client_marshallers.c', > ['--generate-marshallers', '-P', '--client', '--include', > 'client_marshallers.h', '@INPUT@', '@OUTPUT@']], > -['client_marshallers_h', spice_proto, 'generated_client_marshallers.h', > ['--generate-marshallers', '-P', '--client', '--include', > 'common/messages.h', '-H', '@INPUT@', '@OUTPUT@']], > +['client_marshallers', spice_proto, > + ['generated_client_marshallers.c', 'generated_client_marshallers.h'], > + ['--generate-marshallers', > +'-P', '--client', '--include', 'client_marshallers.h', > +'--generated-header', '@OUTPUT1@', > +'@INPUT@', '@OUTPUT0@' > + ] > +] >] > >spice_common_client_sources = [ > @@ -116,8 +122,13 @@ if spice_common_generate_server_code > >targets = [ > ['server_demarshallers', spice_proto, > 'generated_server_demarshallers.c', ['--generate-demarshallers', '--server', > '--include',
