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

makefile: Fix JA*_BIN path

Browse Source
This commit is contained in:
Corentin Le Molgat
2018-09-17 11:06:57 +02:00
parent 76a1327ace
commit b3701b1b9f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/Makefile.java.mk
View File

@@ -248,7 +248,7 @@ $(JAVA_OR_TOOLS_LIBS): \
$(GEN_DIR)/com/google/ortools/sat/SatParameters.java \
$(GEN_DIR)/com/google/ortools/sat/CpModel.java | \
$(CLASS_DIR)/com/google/ortools
$(JAVAC_BIN) -d $(CLASS_DIR) \
"$(JAVAC_BIN)" -d $(CLASS_DIR) \
-cp $(LIB_DIR)$Sprotobuf.jar \
$(SRC_DIR)$Sortools$Scom$Sgoogle$Sortools$Sconstraintsolver$S*.java \
$(SRC_DIR)$Sortools$Scom$Sgoogle$Sortools$Ssat$S*.java \
@@ -257,7 +257,7 @@ $(JAVA_OR_TOOLS_LIBS): \
$(GEN_PATH)$Scom$Sgoogle$Sortools$Salgorithms$S*.java \
$(GEN_PATH)$Scom$Sgoogle$Sortools$Sgraph$S*.java \
$(GEN_PATH)$Scom$Sgoogle$Sortools$Slinearsolver$S*.java
$(JAR_BIN) cvf $(LIB_DIR)$Scom.google.ortools.jar -C $(CLASS_DIR) com$Sgoogle$Sortools$S
"$(JAR_BIN)" cvf $(LIB_DIR)$Scom.google.ortools.jar -C $(CLASS_DIR) com$Sgoogle$Sortools$S
#############################
## Java Examples/Samples ##

4
makefiles/Makefile.third_party.unix.mk
View File

@@ -318,9 +318,9 @@ dependencies/install/lib/protobuf.jar: | dependencies/install/lib/libprotobuf.$L
$(PROTOC) --java_out=core/src/main/java -I../src \
../src/google/protobuf/descriptor.proto
cd dependencies/sources/protobuf-$(PROTOBUF_TAG)/java/core/src/main/java && \
$(JAVAC_BIN) com/google/protobuf/*java
"$(JAVAC_BIN)" com/google/protobuf/*java
cd dependencies/sources/protobuf-$(PROTOBUF_TAG)/java/core/src/main/java && \
$(JAR_BIN) cvf ../../../../../../../install/lib/protobuf.jar com/google/protobuf/*class
"$(JAR_BIN)" cvf ../../../../../../../install/lib/protobuf.jar com/google/protobuf/*class
############################################
## Install Patchelf on linux platforms. ##

4
makefiles/Makefile.third_party.win.mk
View File

@@ -331,8 +331,8 @@ dependencies/install/lib/protobuf.jar: | dependencies/install/bin/protoc.exe
cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java && \
..\\..\\..\\install\\bin\\protoc --java_out=core/src/main/java -I../src \
../src/google/protobuf/descriptor.proto
cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && $(JAVAC_BIN) com\\google\\protobuf\\*java
cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && $(JAR_BIN) cvf ..\\..\\..\\..\\..\\..\\..\\install\\lib\\protobuf.jar com\\google\\protobuf\\*class
cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && "$(JAVAC_BIN)" com\\google\\protobuf\\*java
cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && "$(JAR_BIN)" cvf ..\\..\\..\\..\\..\\..\\..\\install\\lib\\protobuf.jar com\\google\\protobuf\\*class
############
## COIN ##

6
makefiles/Makefile.win.mk
View File

@@ -148,9 +148,9 @@ SWIG_INC = \
SYS_LNK = psapi.lib ws2_32.lib shlwapi.lib
JAVA_INC=/I"$(JAVA_HOME)\\include" /I"$(JAVA_HOME)\\include\\win32"
JAVAC_BIN="$(shell $(WHICH) "$(JAVA_HOME)\bin\javac")"
JAVA_BIN="$(shell $(WHICH) "$(JAVA_HOME)\bin\java")"
JAR_BIN="$(shell $(WHICH) "$(JAVA_HOME)\bin\jar")"
JAVAC_BIN=$(shell $(WHICH) "$(JAVA_HOME)\bin\javac")
JAVA_BIN=$(shell $(WHICH) "$(JAVA_HOME)\bin\java")
JAR_BIN=$(shell $(WHICH) "$(JAVA_HOME)\bin\jar")
DEPENDENCIES_INC = /I$(INC_DIR) /I$(EX_DIR) /I$(GEN_DIR) \
$(ZLIB_INC) $(GFLAGS_INC) $(GLOG_INC) $(PROTOBUF_INC) \