From 3a5846cce014bdab5328f7ce088ce9a6b8c2c87e Mon Sep 17 00:00:00 2001
From: Marc Garcia Puig <mgarcia@cvc.uab.es>
Date: Fri, 9 Mar 2018 18:38:55 +0100
Subject: [PATCH] Moved to native commands for the windows build

---
 Makefile        | 34 +++++++++++++++++-----------------
 Util/Protoc.bat |  6 +++---
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index ec36203e1..8962f9c60 100644
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,16 @@ BASE_BUILD_FOLDER=$(CURDIR)/Util/Build/carlaserver-build
 MY_CMAKE_FOLDER=$(CURDIR)/Util/cmake
 MY_CMAKE_FLAGS=-B"$(BUILD_FOLDER)" -DCMAKE_INSTALL_PREFIX="$(INSTALL_FOLDER)"
 
-define log
-	@echo -- LOG [$(1)] '$($1)'
-endef
-
 ifeq ($(OS),Windows_NT)
 BUILD_RULE=build_windows
 CLEAN_RULE=clean_windows
+CALL_CMAKE_RULE=call_cmake_windows
 PROTOC_COMPILE=cmd.exe /k "cd Util & call Protoc.bat & exit"
 PROTOC_CLEAN=cmd.exe /k "cd Util & call Protoc.bat --clean & exit"
-RM=
 else
 BUILD_RULE=build_linux
+CLEAN_RULE=clean_linux
+CALL_CMAKE_RULE=call_cmake_linux
 PROTOC_COMPILE=./Util/Protoc.sh
 PROTOC_CLEAN=./Util/Protoc.sh --clean
 endif
@@ -45,17 +43,18 @@ build_windows: MY_CMAKE_FLAGS+=-G "NMake Makefiles"
 build_windows: call_cmake
 	@cd $(BUILD_FOLDER) && nmake && nmake install
 
-call_cmake: protobuf
-ifeq ($(OS),Windows_NT)
-	-@mkdir "$(BUILD_FOLDER)"
-else
-	@mkdir -p $(BUILD_FOLDER)
-endif
+call_cmake: protobuf $(CALL_CMAKE_RULE)
 	@cd $(BUILD_FOLDER) && cmake $(MY_CMAKE_FLAGS) "$(MY_CMAKE_FOLDER)"
 
 protobuf:
 	@$(PROTOC_COMPILE)
 
+call_cmake_linux:
+	@mkdir -p $(BUILD_FOLDER)
+
+call_cmake_windows:
+	-@mkdir "$(BUILD_FOLDER)"
+
 ### Docs #######################################################################
 
 docs: doxygen
@@ -66,14 +65,15 @@ doxygen:
 
 ### Clean ######################################################################
 
-clean:
-ifeq ($(OS),Windows_NT)
-	@rd /s /q "$(BASE_BUILD_FOLDER)" "$(INSTALL_FOLDER)"
-else
-	@rm -Rf $(BASE_BUILD_FOLDER) $(INSTALL_FOLDER) Doxygen
-endif
+clean: $(CLEAN_RULE)
 	@$(PROTOC_CLEAN)
 
+clean_linux:
+	@rm -Rf $(BASE_BUILD_FOLDER) $(INSTALL_FOLDER) Doxygen
+
+clean_windows:
+	-@rd /s /q "$(BASE_BUILD_FOLDER)" "$(INSTALL_FOLDER)" Doxygen 2>nul
+
 ### Test #######################################################################
 
 check: debug launch_test_clients run_test_debug kill_test_clients
diff --git a/Util/Protoc.bat b/Util/Protoc.bat
index 551811f29..bd209d7d0 100644
--- a/Util/Protoc.bat
+++ b/Util/Protoc.bat
@@ -7,9 +7,9 @@ set PROTO_BASENAME=carla_server
 
 if "%1" == "--clean" (
   rem Delete existing ones.
-  rm -f %PROTOBUF_CPP_OUT_DIR%/carla_server.pb.h
-  rm -f %PROTOBUF_CPP_OUT_DIR%/carla_server.pb.cc
-  rm -f %PROTOBUF_PY_OUT_DIR%/carla_server_pb2.py
+  @rd /s /q "%PROTOBUF_CPP_OUT_DIR%\carla_server.pb.h" 2>nul
+  @rd /s /q "%PROTOBUF_CPP_OUT_DIR%\carla_server.pb.cc" 2>nul
+  @rd /s /q "%PROTOBUF_PY_OUT_DIR%\carla_server_pb2.py" 2>nul
   goto end
 )