From b10b2e92a44ab37f31cea2d9d50af5f9c039f406 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Mon, 10 Sep 2018 14:26:25 +0200
Subject: [PATCH] Maintenance: update Makefile.java.mk

- Add quotes guards to protect from space in path
---
 makefiles/Makefile.java.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk
index 2052643788..d89c108867 100755
--- a/makefiles/Makefile.java.mk
+++ b/makefiles/Makefile.java.mk
@@ -339,45 +339,43 @@ test_java_samples: $(JAVA_OR_TOOLS_LIBS)
 $(CLASS_DIR)/%: $(JAVA_EX_DIR)/%.java $(JAVA_OR_TOOLS_LIBS) | $(CLASS_DIR)
 	-$(DELREC) $(CLASS_DIR)$S$*
 	-$(MKDIR_P) $(CLASS_DIR)$S$*
-	$(JAVAC_BIN) -d $(CLASS_DIR)$S$* \
+	"$(JAVAC_BIN)" -d $(CLASS_DIR)$S$* \
  -cp $(LIB_DIR)$Scom.google.ortools.jar$(CPSEP)$(LIB_DIR)$Sprotobuf.jar \
  $(JAVA_EX_PATH)$S$*.java
 
 $(CLASS_DIR)/%: $(JAVA_TEST_DIR)/%.java $(JAVA_OR_TOOLS_LIBS) | $(CLASS_DIR)
 	-$(DELREC) $(CLASS_DIR)$S$*
 	-$(MKDIR_P) $(CLASS_DIR)$S$*
-	$(JAVAC_BIN) -d $(CLASS_DIR)$S$* \
+	"$(JAVAC_BIN)" -d $(CLASS_DIR)$S$* \
  -cp $(LIB_DIR)$Scom.google.ortools.jar$(CPSEP)$(LIB_DIR)$Sprotobuf.jar \
  $(JAVA_TEST_PATH)$S$*.java
 
 $(CLASS_DIR)/%: $(SRC_DIR)/ortools/sat/samples/%.java $(JAVA_OR_TOOLS_LIBS) | $(CLASS_DIR)
 	-$(DELREC) $(CLASS_DIR)$S$*
 	-$(MKDIR_P) $(CLASS_DIR)$S$*
-	$(JAVAC_BIN) -d $(CLASS_DIR)$S$* \
+	"$(JAVAC_BIN)" -d $(CLASS_DIR)$S$* \
  -cp $(LIB_DIR)$Scom.google.ortools.jar$(CPSEP)$(LIB_DIR)$Sprotobuf.jar \
  ortools$Ssat$Ssamples$S$*.java
 
 $(LIB_DIR)/%$J: $(CLASS_DIR)/% | $(LIB_DIR)
 	-$(DEL) $(LIB_DIR)$S$*.jar
-	$(JAR_BIN) cvf $(LIB_DIR)$S$*.jar -C $(CLASS_DIR)$S$* .
+	"$(JAR_BIN)" cvf $(LIB_DIR)$S$*.jar -C $(CLASS_DIR)$S$* .
 
 rjava_%: $(LIB_DIR)/%$J
-	$(JAVA_BIN) -Xss2048k $(JAVAFLAGS) \
+	"$(JAVA_BIN)" -Xss2048k $(JAVAFLAGS) \
  -cp $(LIB_DIR)$S$*.jar$(CPSEP)$(LIB_DIR)$Scom.google.ortools.jar$(CPSEP)$(LIB_DIR)$Sprotobuf.jar \
  $* $(ARGS)
 
-ifeq ($(EX),) # Those rules will be used if EX variable is not set
 .PHONY: rjava cjava
+ifeq ($(EX),) # Those rules will be used if EX variable is not set
 rjava cjava:
 	@echo No java file was provided, the $@ target must be used like so: \
  make $@ EX=examples/java/example.java
 else # This generic rule will be used if EX variable is set
 EX_NAME = $(basename $(notdir $(EX)))
 
-.PHONY: cjava
 cjava: $(CLASS_DIR)/$(EX_NAME)
 
-.PHONY: rjava
 rjava: $(LIB_DIR)/$(EX_NAME)$J
 	@echo running $<
 	$(MAKE) rjava_$(EX_NAME)