more work on makefiles
This commit is contained in:
13
Makefile
13
Makefile
@@ -90,9 +90,6 @@ help_doc:
|
||||
|
||||
endif
|
||||
|
||||
# Finally include user makefile if it exists
|
||||
-include $(OR_ROOT)Makefile.user
|
||||
|
||||
.PHONY: help_usage
|
||||
help_usage:
|
||||
@echo Use one of the following targets:
|
||||
@@ -113,22 +110,24 @@ help_all: help_usage help_third_party help_cc help_python help_java help_dotnet
|
||||
|
||||
.PHONY: build_all
|
||||
build_all: cc python java dotnet
|
||||
@echo Or-tools have been built for $(BUILT_LANGUAGES)
|
||||
@echo Or-tools has been built for $(BUILT_LANGUAGES)
|
||||
|
||||
.PHONY: check_all
|
||||
check_all: check_cc check_python check_java check_dotnet
|
||||
@echo Or-tools have been built and checked for $(BUILT_LANGUAGES)
|
||||
@echo Or-tools has been built and checked for $(BUILT_LANGUAGES)
|
||||
|
||||
.PHONY: test_all
|
||||
test_all: test_cc test_python test_java test_dotnet
|
||||
@echo Or-tools have been built and tested for $(BUILT_LANGUAGES)
|
||||
|
||||
.PHONY: clean_all
|
||||
clean_all: clean_cc clean_python clean_java clean_dotnet clean_archive clean_third_party
|
||||
clean_all: #clean_cc clean_python clean_java clean_dotnet clean_archive clean_third_party
|
||||
-$(DELREC) $(BIN_DIR)
|
||||
-$(DELREC) $(LIB_DIR)
|
||||
-$(DELREC) $(OBJ_DIR)
|
||||
@echo Or-tools have been cleaned for $(BUILT_LANGUAGES)
|
||||
@echo NNN $(BUILT_LANGUAGES)
|
||||
@echo Or-Tools has been cleaned for $(BUILT_LANGUAGES)
|
||||
@echo AAA
|
||||
|
||||
.PHONY: detect_all
|
||||
detect_all: detect_port detect_third_party detect_cc detect_python detect_java detect_dotnet detect_archive
|
||||
|
||||
@@ -31,7 +31,8 @@ DOTNET_PACKAGE_PATH = $(subst /,$S,$(DOTNET_PACKAGE_DIR))
|
||||
DOTNET_ORTOOLS_ASSEMBLY_NAME := Google.OrTools
|
||||
|
||||
dotnet: $(OR_TOOLS_LIBS)
|
||||
BUILT_LANGUAGES +=, .Net (6.0)
|
||||
|
||||
BUILT_LANGUAGES += , .Net (6.0)
|
||||
|
||||
###################
|
||||
## .NET SOURCE ##
|
||||
@@ -726,6 +727,7 @@ clean_dotnet:
|
||||
.PHONY: detect_dotnet # Show variables used to build dotnet OR-Tools.
|
||||
detect_dotnet:
|
||||
@echo Relevant info for the dotnet build:
|
||||
@echo BUILD_DOTNET = $(BUILD_DOTNET)
|
||||
@echo DOTNET_BIN = $(DOTNET_BIN)
|
||||
@echo NUGET_BIN = $(NUGET_BIN)
|
||||
@echo PROTOC = $(PROTOC)
|
||||
|
||||
@@ -487,6 +487,7 @@ clean_java:
|
||||
.PHONY: detect_java # Show variables used to build Java OR-Tools.
|
||||
detect_java:
|
||||
@echo Relevant info for the Java build:
|
||||
@echo BUILD_JAVA = $(BUILD_JAVA)
|
||||
@echo JAVA_HOME = $(JAVA_HOME)
|
||||
@echo JAVAC_BIN = $(JAVAC_BIN)
|
||||
@echo CLASS_DIR = $(CLASS_DIR)
|
||||
|
||||
@@ -702,6 +702,7 @@ clean_python:
|
||||
.PHONY: detect_python # Show variables used to build Python OR-Tools.
|
||||
detect_python:
|
||||
@echo Relevant info for the Python build:
|
||||
@echo BUILD_PYTHON = $(BUILD_PYTHON)
|
||||
@echo PYTHON_EXECUTABLE = "$(PYTHON_EXECUTABLE)"
|
||||
@echo PYTHON_VERSION = $(PYTHON_VERSION)
|
||||
ifeq ($(SYSTEM),win)
|
||||
|
||||
Reference in New Issue
Block a user