Ah, my apologies. I will admit I have a bit of a hybrid environment. I
do almost all my development on my mac and have a windows box for
testing/building. It must have been during my editing of the file in vi
that it got the EOL characters changed.
I will modify my git send formatting to not attach as a patch.
-aric
On 4/17/12 2:23 AM, Alon Levy wrote:
On Mon, Apr 16, 2012 at 01:10:01PM -0500, Aric Stewart wrote:
the python script is now in spice-common and client_marshallers.h needs to
be included instead of marshallers.h
Third, the patch doesn't apply because of EOL issues. You should be
using no EOL convertion magic. If you use msysgit then it is
configurable during install time.
---
client/windows/generate.bat | 4 ++--
client/windows/generate1.bat | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/client/windows/generate.bat b/client/windows/generate.bat
index 6bd06d7..70e337a 100644
--- a/client/windows/generate.bat
+++ b/client/windows/generate.bat
@@ -1,2 +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 -P --include "common.h"
--include messages.h --include marshallers.h --client ..\..\spice.proto
..\generated_marshallers.cpp
+python ..\..\spice-common\spice_codegen.py -d -c -i common.h -i messages.h
..\..\spice-common\spice.proto ..\generated_demarshallers.cpp
+python ..\..\spice-common\spice_codegen.py --generate-marshallers -P --include
"common.h" --include messages.h --include client_marshallers.h --client
..\..\spice-common\spice.proto ..\generated_marshallers.cpp
diff --git a/client/windows/generate1.bat b/client/windows/generate1.bat
index 559c670..86af4a5 100644
--- a/client/windows/generate1.bat
+++ b/client/windows/generate1.bat
@@ -1,2 +1,2 @@
-python ..\..\spice_codegen.py -d -c -i common.h -i messages.h --prefix 1
--ptrsize 8 ..\..\spice1.proto ..\generated_demarshallers1.cpp
-python ..\..\spice_codegen.py --generate-marshallers -P --include "common.h"
--include messages.h --include marshallers.h --client --prefix 1 --ptrsize 8
..\..\spice1.proto ..\generated_marshallers1.cpp
+python ..\..\spice-common\spice_codegen.py -d -c -i common.h -i messages.h
--prefix 1 --ptrsize 8 ..\..\spice-common\spice1.proto
..\generated_demarshallers1.cpp
+python ..\..\spice-common\spice_codegen.py --generate-marshallers -P --include
"common.h" --include messages.h --include client_marshallers.h --client
--prefix 1 --ptrsize 8 ..\..\spice-common\spice1.proto ..\generated_marshallers1.cpp
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
