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

dotnet: move some targets

Browse Source
This commit is contained in:
Corentin Le Molgat
2018-07-13 17:43:27 +02:00
parent 496be1627a
commit 52c126c4c9
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
makefiles/Makefile.dotnet.mk
View File

@@ -47,9 +47,10 @@ HAS_DOTNET =
endif
# Main target
.PHONY: dotnet # Build OrTools for .NET
dotnet: ortoolslibs csharp_dotnet fsharp_dotnet
.PHONY: csharp_dotnet # Build C# OR-Tools
csharp_dotnet: $(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$D $(BIN_DIR)/$(CLR_PROTOBUF_DLL_NAME)$D
BUILT_LANGUAGES +=, dotnet \(netstandard2.0\)
# Assembly Info
$(GEN_DIR)/ortools/properties:
@@ -59,6 +60,9 @@ $(GEN_DIR)/ortools/properties/GitVersion$(OR_TOOLS_VERSION).txt: \
| $(GEN_DIR)/ortools/properties
@echo $(OR_TOOLS_VERSION) > $(GEN_PATH)$Sortools$Sproperties$SGitVersion$(OR_TOOLS_VERSION).txt
.PHONY: csharp_dotnet # Build C# OR-Tools
csharp_dotnet: $(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$D $(BIN_DIR)/$(CLR_PROTOBUF_DLL_NAME)$D
# Auto-generated code
$(BIN_DIR)/$(CLR_PROTOBUF_DLL_NAME)$D: tools/dotnet/$(CLR_PROTOBUF_DLL_NAME)$D | $(BIN_DIR)
$(COPY) tools$Sdotnet$S$(CLR_PROTOBUF_DLL_NAME)$D $(BIN_DIR)
@@ -250,12 +254,6 @@ $(GEN_DIR)/ortools/sat/SatParameters.pb.cs: \
$(CLR_KEYFILE): | $(BIN_DIR)
"$(DOTNET_BIN)" run --project tools$Sdotnet$SCreateSigningKey$SCreateSigningKey.csproj $S$(CLR_KEYFILE_PATH)
# Main DLL
.PHONY: dotnet # Build OrTools for .NET
dotnet: ortoolslibs csharp_dotnet fsharp_dotnet
BUILT_LANGUAGES +=, dotnet \(netstandard2.0\)
$(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$D: \
$(SRC_DIR)/ortools/dotnet/$(ORTOOLS_DLL_NAME)/$(ORTOOLS_DLL_NAME).csproj \
$(OR_TOOLS_LIBS) \