always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maintenance: update Makefile.java.mk

Browse Source 
- Add quotes guards to protect from space in path
This commit is contained in:
Corentin Le Molgat
2018-09-10 14:26:25 +02:00
parent 67730bb415
commit b10b2e92a4
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
makefiles/Makefile.java.mk
View File

@@ -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)