From 3f0c85d5e0545de6780ff4c1f3532914c2d17eb4 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Mon, 21 Feb 2022 17:45:51 +0100 Subject: [PATCH] readd make python java dotnet --- makefiles/Makefile.cpp.mk | 1 + makefiles/Makefile.dotnet.mk | 3 +++ makefiles/Makefile.java.mk | 2 +- makefiles/Makefile.python.mk | 6 +++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index 179444dd80..6f120a6c6f 100644 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -44,6 +44,7 @@ $(OR_TOOLS_LIBS): $(THIRD_PARTY_TARGET) $(TOUCH) $(OR_TOOLS_LIBS) compile_libraries: $(OR_TOOLS_LIBS) +cc: OR_TOOLS_LIBS test_cc: \ $(OR_TOOLS_LIBS) \ diff --git a/makefiles/Makefile.dotnet.mk b/makefiles/Makefile.dotnet.mk index 565e2c4808..2841fdf2fc 100644 --- a/makefiles/Makefile.dotnet.mk +++ b/makefiles/Makefile.dotnet.mk @@ -22,6 +22,9 @@ TEMP_DOTNET_DIR = temp_dotnet DOTNET_PACKAGE_DIR = temp_dotnet/packages DOTNET_PACKAGE_PATH = $(subst /,$S,$(DOTNET_PACKAGE_DIR)) DOTNET_ORTOOLS_ASSEMBLY_NAME := Google.OrTools + +dotnet: $(OR_TOOLS_LIBS) + ################### ## .NET SOURCE ## ################### diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk index 0b16550296..130d730533 100644 --- a/makefiles/Makefile.java.mk +++ b/makefiles/Makefile.java.mk @@ -50,7 +50,7 @@ check_java: java test_java: java else java_runtime: java_runtime_pimpl -java: +java: $(OR_TOOLS_LIBS) check_java: check_java_pimpl test_java: test_java_pimpl BUILT_LANGUAGES +=, Java diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk index 3b06f2eb7f..77c53a5e1e 100644 --- a/makefiles/Makefile.python.mk +++ b/makefiles/Makefile.python.mk @@ -10,7 +10,11 @@ else @echo endif -PYTHON_EXECUTABLE := dependencies$Spython$Svenv$Sbin$Spython####################### +PYTHON_EXECUTABLE := dependencies$Spython$Svenv$Sbin$Spython + +python: $(OR_TOOLS_LIBS) + +####################### ## Python SOURCE ## ####################### ifeq ($(SOURCE_SUFFIX),.py) # Those rules will be used if SOURCE contains a .py file