From 8524e60172467a4be45dd5464fbb6f2b4f5428a4 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Mon, 21 Feb 2022 16:44:53 +0100 Subject: [PATCH] fix targets --- makefiles/Makefile.dotnet.mk | 2 +- makefiles/Makefile.java.mk | 4 ++-- makefiles/Makefile.python.mk | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/makefiles/Makefile.dotnet.mk b/makefiles/Makefile.dotnet.mk index 129387253d..60b5f01173 100644 --- a/makefiles/Makefile.dotnet.mk +++ b/makefiles/Makefile.dotnet.mk @@ -639,7 +639,7 @@ endif ## Nuget artifact ## ###################### -package_dotnet: compile_libraries +package_dotnet: $(OR_TOOLS_LIBS) -$(DEL) $.*pkg $(COPY) dependencies$Sdotnet$Spackages$S*.*pkg . diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk index 66b77b1c6a..9e3ea45a0c 100644 --- a/makefiles/Makefile.java.mk +++ b/makefiles/Makefile.java.mk @@ -79,8 +79,8 @@ JAVA_PATH := $(TEMP_JAVA_DIR)$S$(JAVA_ORTOOLS_PROJECT)$Ssrc$Smain $(TEMP_JAVA_DIR): $(MKDIR) $(TEMP_JAVA_DIR) -package_java: compile_libraries - $(DEL) *.jar +package_java: $(OR_TOOLS_LIBS) + -$(DEL) *.jar $(COPY) dependencies$Sjava$Sortools-java$Starget$S*.jar . $(COPY) dependencies$Sjava$Sortools-$(JAVA_NATIVE_IDENTIFIER)$Starget$S*.jar . diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk index 7a99cddc0c..f7fe5ede9c 100644 --- a/makefiles/Makefile.python.mk +++ b/makefiles/Makefile.python.mk @@ -481,12 +481,9 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/.libs: | $(PYPI_ARCHIVE_TEMP_DIR)/ortoo -$(MKDIR) $(PYPI_ARCHIVE_TEMP_DIR)$Sortools$Sortools$S.libs ifneq ($(PYTHON_EXECUTABLE),) -.PHONY: pypi_archive -package_python pypi_archive: $(OR_TOOLS_LIBS) python $(MISSING_PYPI_FILES) -ifeq ($(SYSTEM),unix) - cp $(OR_TOOLS_LIBS) $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/.libs -endif - cd $(PYPI_ARCHIVE_TEMP_DIR)$Sortools && "$(PYTHON_EXECUTABLE)" setup.py bdist_wheel +package_python: $(OR_TOOLS_LIBS) + -$(DEL) $.*whl + $(COPY) dependencies$Spython$Sdist$S*.whl . .PHONY: test_package_python # Test Python "ortools" wheel package test_package_python: package_python