bugfix on client compilation on labs' computers

Author: tohanov

.gitignore

@@ -4,6 +4,7 @@
 !.vscode/launch.json
 !.gitignore
 !tarCommands.sh
+!readme.txt
 
 !Client
 !Client/**

Client/makefile

@@ -3,14 +3,15 @@ executable_name:=BGSclient
 # compile_flags:=-c -Wall -Weffc++ -g -std=c++11 -Iinclude -O3 -pthread
 # link_flags:=-lboost_system -lpthread -lstdc++ -lboost_thread 
 
-compile_flags:=-c -Iinclude -pthread -std=c++11 -O3 -Wall -Weffc++ -g
-link_flags:=-lboost_system -lboost_thread -lpthread
-object_files:=			bin/BGSclient.o \
-				bin/clientConnectionHandler.o \
-				bin/readFromKeyboardTask.o \
-				bin/readFromSocketTask.o \
-				bin/clientProtocol.o \
-				bin/clientEncoderDecoder.o
+compile_flags:=-c -Iinclude -std=c++11 -Wall -Weffc++ -g
+link_flags:=-lboost_thread -lboost_system -lpthread -lstdc++ -pthread -L/usr/lib/x86_64-linux-gnu
+object_files:=	\
+	bin/BGSclient.o \
+	bin/clientConnectionHandler.o \
+	bin/readFromKeyboardTask.o \
+	bin/readFromSocketTask.o \
+	bin/clientProtocol.o \
+	bin/clientEncoderDecoder.o
 
 
 # all: clear compile link
@@ -33,7 +34,7 @@ compile: client
 
 link: $(object_files)
 	echo "[*] Linking everything..."
-	g++ $(link_flags) -o bin/$(executable_name) $(object_files)
+	g++ $(link_flags) -o bin/$(executable_name) $(object_files) -lboost_system
 
 
 check: bin/studio ExampleInput.txt #TODO

Client/makefile from group

@@ -0,0 +1,27 @@
+CXX = g++
+CXXFLAGS = -c -Wall -Weffc++ -g -std=c++11
+CPPFLAGS = -I ./include -MMD -MP
+LDFLAGS := -lboost_system -lboost_thread -lpthread
+
+SRCS = $(wildcard ./src/*.cpp)
+OBJS = $(patsubst ./src/%.cpp,./bin/%.o, $(SRCS))
+DEPS := $(patsubst %.o,%.cpp, $(OBJS))
+
+# default target
+all: ./bin/BGSclient
+
+# build studio
+./bin/BGSclient: $(OBJS)
+	@echo "Building ..."
+	$(CXX) $(OBJS) -o $@ $(LDFLAGS)
+	@echo "Finished building"
+
+# build cpp files
+./bin/%.o: ./src/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
+
+# clean build files
+clean:
+	@rm -f ./bin/*
+
+-include $(DEPS)

Client/src/clientEncoderDecoder.cpp

@@ -199,7 +199,7 @@ void parseFollowUnfollow(string &output) {
 void parseStatLogStat(string &output) {
 	output += " ";
 
-	for (int index = 4; index < bytes.size() /* bytes[index] != ';' */; index += 8) {
+	for (size_t index = 4; index < bytes.size() /* bytes[index] != ';' */; index += 8) {
 		// cout << "[*] parseStatLogStat(), inside loop, index=" << index ;
 		// cout << ", byte=" << bytes[index] << endl;
 

readme.txt

@@ -0,0 +1,42 @@
+readme.txt:
+
+1) how to run our code:
+	compilation:
+		(from the Client directory:)
+		make
+	
+		(from the Server directory:)
+		mvn clean
+		mvn package
+	
+	1.1) command line for each server:
+		(from the Server directory:)
+		(to run TPC:)
+		java -jar target/bgs_tpc.jar <port>
+		
+		(to run Reactor:)
+		java -jar target/bgs_reactor.jar <num_threads> <port>
+	
+	1.2) Examples for each command:
+		
+		register name1 pass123 12-12-2000
+		register name2 pass123 12-12-2001
+
+		login name1 pass1 1
+
+		logout
+
+		follow 0 name1
+		follow 1 name1
+
+		post the user @name1 listens to me
+
+		pm name1 war is bad
+
+		logstat
+
+		stat name1 name2 
+
+		block name1
+		
+2) We stored the filtered set of word inside HashSet in the static class FilteredWordsWrapper, which is inside the PM_Message class (bgu.spl.net.impl.messages.FilteredWordsWrapper)

tarCommands.sh

@@ -1,5 +1,5 @@
 ARCHIVE=submission.tar.gz
 
-tar -czf $ARCHIVE  Client/src Client/include/ Client/bin/.gitkeep Client/makefile Server/src/ Server/pom.xml
+tar -czf $ARCHIVE  Client/src Client/include/ Client/bin/.gitkeep Client/makefile Server/src/ Server/pom.xml readme.txt
 tar -tvf $ARCHIVE