pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-09 22:36:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Generate marshaller/demarshallers for old protocol

Browse Source
This commit is contained in:
Alexander Larsson 2010-06-22 16:35:13 +02:00
parent ededfd7ebb
commit 2788b2ec46
8 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -6,4 +6,4 @@ pkgconfig_DATA = spice-server.pc
DISTCLEANFILES = \
spice-server.pc
EXTRA_DIST = spice.proto spice_codegen.py
EXTRA_DIST = spice.proto spice1.proto spice_codegen.py

10
client/Makefile.am
View File

@ -3,14 +3,20 @@ NULL =
SUBDIRS = . $(red_target)
DIST_SUBDIRS = x11 #windows
spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp
spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp generated_demarshallers1.cpp generated_marshallers1.cpp
generated_demarshallers.cpp: $(top_srcdir)/spice.proto
$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h $(top_srcdir)/spice.proto generated_demarshallers.cpp
generated_demarshallers1.cpp: $(top_srcdir)/spice1.proto
$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h --prefix 1 $(top_srcdir)/spice1.proto generated_demarshallers1.cpp
generated_marshallers.cpp: $(top_srcdir)/spice.proto
$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client $(top_srcdir)/spice.proto generated_marshallers.cpp
generated_marshallers1.cpp: $(top_srcdir)/spice1.proto
$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client --prefix 1 $(top_srcdir)/spice1.proto generated_marshallers1.cpp
if SUPPORT_GL
GL_SRCS = \
gl_canvas.cpp \
@ -44,8 +50,10 @@ RED_COMMON_SRCS = \
demarshallers.h \
marshallers.h \
generated_demarshallers.cpp \
generated_demarshallers1.cpp \
marshaller.cpp \
generated_marshallers.cpp \
generated_marshallers1.cpp \
cursor_channel.cpp \
cursor_channel.h \
cursor.cpp \

1
client/demarshallers.h
View File

@ -22,6 +22,7 @@ typedef uint8_t * (*spice_parse_channel_func_t)(uint8_t *message_start, uint8_t
size_t *size_out, message_destructor_t *free_message);
spice_parse_channel_func_t spice_get_server_channel_parser(uint32_t channel, unsigned int *max_message_type);
spice_parse_channel_func_t spice_get_server_channel_parser1(uint32_t channel, unsigned int *max_message_type);
#endif

1
client/marshallers.h
View File

@ -56,5 +56,6 @@ typedef struct {
} SpiceMessageMarshallers;
SpiceMessageMarshallers *spice_message_marshallers_get(void);
SpiceMessageMarshallers *spice_message_marshallers_get1(void);
#endif

3
client/windows/generate.bat
View File

@ -1,3 +1,2 @@
python ..\..\spice_codegen.py -d -c -i common.h -i messages.h ..\..\spice.proto ..\generated_demarshallers.cpp
python ..\..\spice_codegen.py --generate-marshallers --include messages.h --client ..\..\spice.proto ..\generated_marshallers.cpp
python ..\..\spice_codegen.py --generate-marshallers --client -H ..\..\spice.proto ..\generated_marshallers.h
python ..\..\spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client ..\..\spice.proto ..\generated_marshallers.cpp

2
client/windows/generate1.bat Normal file
View File

@ -0,0 +1,2 @@
python ..\..\spice_codegen.py -d -c -i common.h -i messages.h --prefix 1 ..\..\spice1.proto ..\generated_demarshallers1.cpp
python ..\..\spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client --prefix 1 ..\..\spice1.proto ..\generated_marshallers1.cpp

49
client/windows/redc.vcproj
View File

@ -235,6 +235,18 @@
RelativePath="..\generated_demarshallers.cpp"
>
</File>
<File
RelativePath="..\generated_demarshallers1.cpp"
>
</File>
<File
RelativePath="..\generated_marshallers.cpp"
>
</File>
<File
RelativePath="..\generated_marshallers1.cpp"
>
</File>
<File
RelativePath="..\glz_decoder.cpp"
>
@ -503,14 +515,6 @@
RelativePath="..\..\common\gdi_canvas.h"
>
</File>
<File
RelativePath="..\generated_marshallers.cpp"
>
</File>
<File
RelativePath="..\generated_marshallers.h"
>
</File>
<File
RelativePath="..\..\common\win\my_getopt-1.5\getopt.h"
>
@ -717,7 +721,7 @@
Description="Generating demarshaller"
CommandLine="generate.bat"
AdditionalDependencies=""
Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.h;$(ProjectDir)/../generated_marshallers.cpp"
Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.cpp"
/>
</FileConfiguration>
<FileConfiguration
@ -727,7 +731,32 @@
Name="VCCustomBuildTool"
Description="Generating demarshaller"
CommandLine="generate.bat"
Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.h;$(ProjectDir)/../generated_marshallers.cpp"
Outputs="$(ProjectDir)/../generated_demarshallers.cpp;$(ProjectDir)/../generated_marshallers.cpp"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\spice1.proto"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating old demarshaller"
CommandLine="generate1.bat"
AdditionalDependencies=""
Outputs="$(ProjectDir)/../generated_demarshallers1.cpp;$(ProjectDir)/../generated_marshallers1.cpp"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="Generating old demarshaller"
CommandLine="generate1.bat"
Outputs="$(ProjectDir)/../generated_demarshallers1.cpp;$(ProjectDir)/../generated_marshallers1.cpp"
/>
</FileConfiguration>
</File>

2
client/x11/Makefile.am
View File

@ -38,9 +38,11 @@ RED_COMMON_SRCS = \
$(CLIENT_DIR)/cache.hpp \
$(CLIENT_DIR)/demarshallers.h \
$(CLIENT_DIR)/generated_demarshallers.cpp \
$(CLIENT_DIR)/generated_demarshallers1.cpp \
$(CLIENT_DIR)/marshaller.cpp \
$(CLIENT_DIR)/marshallers.h \
$(CLIENT_DIR)/generated_marshallers.cpp \
$(CLIENT_DIR)/generated_marshallers1.cpp \
$(CLIENT_DIR)/sw_canvas.cpp \
$(CLIENT_DIR)/canvas.cpp \
$(CLIENT_DIR)/canvas.h \