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

make: clean up java rules

Browse Source
This commit is contained in:
Corentin Le Molgat
2021-12-03 17:23:21 +01:00
parent e41b99a930
commit 282a310ab9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
makefiles/Makefile.java.mk
View File

@@ -415,7 +415,9 @@ GPG_ARGS ?= <arg>--pinentry-mode</arg><arg>loopback</arg>
$(TEMP_JAVA_DIR):
$(MKDIR) $(TEMP_JAVA_DIR)
# ortools-native
#########################
# Java Runtime Package ##
#########################
$(TEMP_JAVA_DIR)/$(JAVA_ORTOOLS_NATIVE_PROJECT): | $(TEMP_JAVA_DIR)
$(MKDIR) $(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_NATIVE_PROJECT)
@@ -448,7 +450,9 @@ endif
cd $(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_NATIVE_PROJECT) && "$(MVN_BIN)" install -B $(GPG_SIGN)
$(TOUCH) $(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_NATIVE_PROJECT)$Stimestamp
# ortools-java
####################
## JAVA Package ##
####################
ifeq ($(UNIVERSAL_JAVA_PACKAGE),1)
JAVA_ORTOOLS_POM=pom-full.xml.in
else
@@ -566,7 +570,6 @@ $$(TEMP_JAVA_DIR)/$1/%/$$(JAVA_SRC_DIR)/%.java: \
rjava_%: \
java \
$$(SRC_DIR)/ortools/$1/samples/%.java \
$$(TEMP_JAVA_DIR)/$1/%/pom.xml \
$$(TEMP_JAVA_DIR)/$1/%/$$(JAVA_SRC_DIR)/%.java \
FORCE
@@ -617,7 +620,6 @@ $$(TEMP_JAVA_DIR)/$1/%/$$(JAVA_SRC_DIR)/%.java: \
rjava_%: \
java \
$$(SRC_DIR)/examples/$1/%.java \
$$(TEMP_JAVA_DIR)/$1/%/pom.xml \
$$(TEMP_JAVA_DIR)/$1/%/$$(JAVA_SRC_DIR)/%.java \
FORCE
@@ -665,7 +667,6 @@ $(TEMP_JAVA_DIR)/tests/%/$(JAVA_TEST_DIR)/%.java: \
rjava_%: \
java \
$(SRC_DIR)/examples/tests/%.java \
$(TEMP_JAVA_DIR)/tests/%/pom.xml \
$(TEMP_JAVA_DIR)/tests/%/$(JAVA_TEST_DIR)/%.java \
FORCE