#3200 fixup

makefiles/Makefile.cpp.mk

@@ -349,18 +349,18 @@ endif
 ##  Test targets  ##
 ####################
 
-.PHONY: test_cc_algorithms_samples # Build and Run all C++ Algorithms Samples (located in ortools/algorithms/samples)
-test_cc_algorithms_samples: \
+.PHONY: test_cpp_algorithms_samples # Build and Run all C++ Algorithms Samples (located in ortools/algorithms/samples)
+test_cpp_algorithms_samples: \
  rcpp_knapsack \
  rcpp_simple_knapsack_program
 
-.PHONY: test_cc_graph_samples # Build and Run all C++ Graph Samples (located in ortools/graph/samples)
-test_cc_graph_samples: \
+.PHONY: test_cpp_graph_samples # Build and Run all C++ Graph Samples (located in ortools/graph/samples)
+test_cpp_graph_samples: \
  rcpp_simple_max_flow_program \
  rcpp_simple_min_cost_flow_program
 
-.PHONY: test_cc_constraint_solver_samples # Build and Run all C++ CP Samples (located in ortools/constraint_solver/samples)
-test_cc_constraint_solver_samples: \
+.PHONY: test_cpp_constraint_solver_samples # Build and Run all C++ CP Samples (located in ortools/constraint_solver/samples)
+test_cpp_constraint_solver_samples: \
  rcpp_minimal_jobshop_cp \
  rcpp_nurses_cp \
  rcpp_rabbits_and_pheasants_cp \
@@ -385,8 +385,8 @@ test_cc_constraint_solver_samples: \
  rcpp_vrp_time_windows \
  rcpp_vrp_with_time_limit
 
-.PHONY: test_cc_linear_solver_samples # Build and Run all C++ LP Samples (located in ortools/linear_solver/samples)
-test_cc_linear_solver_samples: \
+.PHONY: test_cpp_linear_solver_samples # Build and Run all C++ LP Samples (located in ortools/linear_solver/samples)
+test_cpp_linear_solver_samples: \
  rcpp_assignment_mip \
  rcpp_basic_example \
  rcpp_bin_packing_mip \
@@ -402,8 +402,8 @@ test_cc_linear_solver_samples: \
 test_cc_model_builder_samples: \
 
 
-.PHONY: test_cc_sat_samples # Build and Run all C++ Sat Samples (located in ortools/sat/samples)
-test_cc_sat_samples: \
+.PHONY: test_cpp_sat_samples # Build and Run all C++ Sat Samples (located in ortools/sat/samples)
+test_cpp_sat_samples: \
  rcpp_assignment_sat \
  rcpp_assumptions_sample_sat \
  rcpp_binpacking_problem_sat \
@@ -428,12 +428,12 @@ test_cc_sat_samples: \
 
 .PHONY: check_cpp_pimpl
 check_cpp_pimpl: \
- test_cc_algorithms_samples \
- test_cc_constraint_solver_samples \
- test_cc_graph_samples \
- test_cc_linear_solver_samples \
- test_cc_model_builder_samples \
- test_cc_sat_samples \
+ test_cpp_algorithms_samples \
+ test_cpp_constraint_solver_samples \
+ test_cpp_graph_samples \
+ test_cpp_linear_solver_samples \
+ test_cpp_model_builder_samples \
+ test_cpp_sat_samples \
  \
  rcpp_linear_programming \
  rcpp_constraint_programming_cp \
@@ -564,44 +564,6 @@ else
 	$(TAR) --no-same-owner -czvf $(INSTALL_CPP_NAME)$(ARCHIVE_EXT) $(INSTALL_CPP_NAME)
 endif
 
-
-
-
-
-
-#################
-##  Packaging  ##
-#################
-TEMP_PACKAGE_CC_DIR = temp_package_cc
-
-$(TEMP_PACKAGE_CC_DIR):
-	-$(MKDIR_P) $(TEMP_PACKAGE_CC_DIR)
-
-$(TEMP_PACKAGE_CC_DIR)/$(INSTALL_DIR): | $(TEMP_PACKAGE_CC_DIR)
-	$(MKDIR) $(TEMP_PACKAGE_CC_DIR)$S$(INSTALL_DIR)
-
-package_cc: cpp | $(TEMP_PACKAGE_CC_DIR)/$(INSTALL_DIR)
-ifeq ($(PLATFORM),WIN64)
-	cd $(TEMP_PACKAGE_CC_DIR)\$(INSTALL_DIR) && \
-		..\..\$(TAR) -C ..\.. -c -v include | ..\..\$(TAR) xvm
-	cd $(TEMP_PACKAGE_CC_DIR)\$(INSTALL_DIR) && \
-		..\..\$(TAR) -C ..\.. -c -v lib | ..\..\$(TAR) xvm
-	cd $(TEMP_PACKAGE_CC_DIR)\$(INSTALL_DIR) && \
-		..\..\$(TAR) -C ..\.. -c -v share | ..\..\$(TAR) xvm
-else
-	cd $(TEMP_PACKAGE_CC_DIR)/$(INSTALL_DIR) && \
-		tar -C ../.. -c -v include | tar xvm
-	cd $(TEMP_PACKAGE_CC_DIR)/$(INSTALL_DIR) && \
-		tar -C ../.. -c -v lib | tar xvm
-	cd $(TEMP_PACKAGE_CC_DIR)/$(INSTALL_DIR) && \
-		tar -C ../.. -c -v share | tar xvm
-endif
-ifeq ($(PLATFORM),WIN64)
-	cd $(TEMP_PACKAGE_CC_DIR) && ..$S$(ZIP) -r ..$S$(INSTALL_DIR)$(ARCHIVE_EXT) $(INSTALL_DIR)
-else
-	$(TAR) -C $(TEMP_PACKAGE_CC_DIR) --no-same-owner -czvf $(INSTALL_DIR)$(ARCHIVE_EXT) $(INSTALL_DIR)
-endif
-
 ###############
 ##  INSTALL  ##
 ###############

makefiles/Makefile.java.mk

@@ -407,6 +407,62 @@ test_java: \
  test_java_contrib \
  test_java_java
 
+###############
+##  Archive  ##
+###############
+.PHONY: archive_java # Add C++ OR-Tools to archive.
+archive_java: $(INSTALL_JAVA_NAME)$(ARCHIVE_EXT)
+
+$(INSTALL_JAVA_NAME):
+	$(MKDIR) $(INSTALL_JAVA_NAME)
+
+$(INSTALL_JAVA_NAME)/examples: | $(INSTALL_JAVA_NAME)
+	$(MKDIR) $(INSTALL_JAVA_NAME)$Sexamples
+
+define java-sample-archive =
+$(INSTALL_JAVA_NAME)/examples/%/CMakeLists.txt: \
+ $(TEMP_JAVA_DIR)/$1/%/pom.xml \
+ $(SRC_DIR)/ortools/$1/samples/%.java \
+ | $(INSTALL_JAVA_NAME)/examples
+	-$(MKDIR_P) $(INSTALL_JAVA_NAME)$Sexamples$S$$*
+	$(COPY) $(SRC_DIR)$Sortools$S$1$Ssamples$S$$*.cs $(INSTALL_JAVA_NAME)$Sexamples$S$$*
+	$(COPY) $(TEMP_JAVA_DIR)$S$1$S$$*$SCMakeLists.txt $(INSTALL_JAVA_NAME)$Sexamples$S$$*
+endef
+
+$(foreach sample,$(JAVA_SAMPLES),$(eval $(call java-sample-archive,$(sample))))
+
+define java-example-archive =
+$(TEMP_ARCHIVE_DIR)/$(INSTALL_DIR)/examples/%/CMakeLists.txt: \
+ $(TEMP_JAVA_DIR)/$1/%/pom.xml \
+ $(SRC_DIR)/examples/$1/%.java \
+ | $(INSTALL_JAVA_NAME)/examples
+	-$(MKDIR_P) $(INSTALL_JAVA_NAME)$Sexamples$S$$*
+	$(COPY) $(SRC_DIR)$Sexamples$S$1$S$$*.cs $(INSTALL_JAVA_NAME)$Sexamples$S$$*
+	$(COPY) $(TEMP_JAVA_DIR)$S$1$S$$*$SCMakeLists.txt $(INSTALL_JAVA_NAME)$Sexamples$S$$*
+endef
+
+$(foreach example,$(JAVA_EXAMPLES),$(eval $(call java-example-archive,$(example))))
+
+SAMPLE_JAVA_FILES = \
+  $(addsuffix /CMakeLists.txt,$(addprefix $(INSTALL_JAVA_NAME)/examples/,$(basename $(notdir $(wildcard ortools/*/samples/*.cs)))))
+
+EXAMPLE_JAVA_FILES = \
+  $(addsuffix /CMakeLists.txt,$(addprefix $(INSTALL_JAVA_NAME)/examples/,$(basename $(notdir $(wildcard examples/contrib/*.cs))))) \
+  $(addsuffix /CMakeLists.txt,$(addprefix $(INSTALL_JAVA_NAME)/examples/,$(basename $(notdir $(wildcard examples/java/*.cs)))))
+
+$(INSTALL_JAVA_NAME)$(ARCHIVE_EXT): java \
+ $(SAMPLE_JAVA_FILES) \
+ $(EXAMPLE_JAVA_FILES)
+	$(COPY) $(BUILD_DIR)$Sjava$Spackages$S*.nupkg $(INSTALL_JAVA_NAME)
+ifeq ($(PLATFORM),WIN64)
+	$(ZIP) -r $(INSTALL_JAVA_NAME)$(ARCHIVE_EXT) $(INSTALL_JAVA_NAME)
+else
+	$(TAR) --no-same-owner -czvf $(INSTALL_JAVA_NAME)$(ARCHIVE_EXT) $(INSTALL_JAVA_NAME)
+endif
+
+########################
+##  Publish Java Pkg  ##
+########################
 .PHONY: publish_java_runtime
 publish_java_runtime: java_runtime
 	cd $(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_NATIVE_PROJECT) && "$(MVN_BIN)" deploy