restructured

Author: kgibbons

C++/src/client_sync.cc

@@ -1,7 +1,7 @@
 #include <iostream>
 #include <boost/asio.hpp>
 
-#include "msg.pb.h"
+#include "../gen/msg.pb.h"
 
 using namespace std;
 

C++/src/server_async.cc

@@ -3,7 +3,7 @@
 #include <functional>
 #include <vector>
 #include <boost/asio.hpp>
-#include "msg.pb.h"
+#include "../gen/msg.pb.h"
 
 #include "asio_server.h"
 

C++/src/server_sync.cc

@@ -2,7 +2,7 @@
 #include <array>
 #include <vector>
 #include <boost/asio.hpp>
-#include "msg.pb.h"
+#include "../gen/msg.pb.h"
 
 
 #include "asio_server.h"

Python/client.py

@@ -1,6 +1,6 @@
 import socket
 from struct import pack
-import msg_pb2
+from gen import msg_pb2
 
 sock = socket.socket(socket.AF_UNIX)
 address = './socket'

Python/server.py

@@ -1,7 +1,7 @@
 import SocketServer
 from struct import unpack
 from os import unlink
-import msg_pb2
+from gen import msg_pb2
 
 
 address = './socket'
@@ -19,7 +19,10 @@ def handle(self):
 		print("Message: " + pb_message.cont)
 
 
+try:
+	unlink(address)
+except OSError as e:
+	pass
 
-unlink(address)
 server = SocketServer.UnixStreamServer(address, Session)
 server.serve_forever()

makefile

@@ -1,22 +1,31 @@
 
-BINS = client_sync server_sync server_async
+CPP_BINS = client_sync server_sync server_async
 
 # consider also -lboost_thread-mt -lpthread
-LIBS = -lboost_system-mt -lprotobuf
-CFLAGS = -Wall -O2 --std=c++11 -L/usr/local/lib 
+CPP_LIBS = -lboost_system-mt -lprotobuf
+CPP_FLAGS = -Wall -O2 --std=c++11 -L/usr/local/lib 
 
-all: $(BINS) msg_pb2.py
+all: CPP Python
 
+CPP: $(CPP_BINS)
 
-$(BINS): %: %.cc msg.pb.cc asio_server.h
-	clang++ $(CFLAGS) $@.cc msg.pb.cc -o $@ $(LIBS)
+Python: Python/gen/msg_pb2.py
 
-msg.pb.cc: msg.proto
-	protoc --cpp_out=. msg.proto
+$(CPP_BINS): %: C++/src/%.cc C++/gen/msg.pb.cc C++/src/asio_server.h
+	clang++ $(CPP_FLAGS) C++/src/$@.cc C++/gen/msg.pb.cc -o C++/bin/$@ $(CPP_LIBS)
+	cp C++/bin/$@ bin/cpp_$@
 
-msg_pb2.py: msg.proto
-	protoc --python_out=. msg.proto
+C++/gen/msg.pb.cc: msg.proto
+	protoc --cpp_out=C++/gen msg.proto
+
+Python/gen/msg_pb2.py: msg.proto
+	touch Python/gen/__init__.py # I hate this.
+	protoc --python_out=Python/gen msg.proto
+	echo "#!/bin/sh\n\npython Python/client.py" > bin/python_client.sh
+	chmod +x bin/python_client.sh
+	echo "#!/bin/sh\n\npython Python/server.py" > bin/python_server.sh
+	chmod +x bin/python_server.sh
 
 .PHONY : clean
 clean:
-	rm -f $(BINS) msg.pb.cc msg.pb.h msg_pb2.py msg_pb2.pyc
+	rm -f C++/bin/* C++/gen/* Python/gen/* bin/*

msg.proto

@@ -0,0 +1,8 @@
+package asio;
+
+
+//option optimize_for = LITE_RUNTIME;
+
+message Boring {
+	required string cont = 1;
+}