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

Make:dotnet: Add few more *_DIR variables

Browse Source
This commit is contained in:
Corentin Le Molgat
2020-03-05 15:37:41 +01:00
parent 15afa43e65
commit e8e0cf0425
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/Makefile.dotnet.mk
View File

@@ -393,6 +393,10 @@ $(SRC_DIR)/ortools/dotnet/$(OR_TOOLS_ASSEMBLY_NAME)/$(OR_TOOLS_ASSEMBLY_NAME).cs
ortools$Sdotnet$S$(OR_TOOLS_ASSEMBLY_NAME)$S$(OR_TOOLS_ASSEMBLY_NAME).csproj.in \
> ortools$Sdotnet$S$(OR_TOOLS_ASSEMBLY_NAME)$S$(OR_TOOLS_ASSEMBLY_NAME).csproj
$(SED) -i -e 's/@DOTNET_PACKAGES_DIR@/..\/..\/..\/packages/' \
ortools$Sdotnet$S$(OR_TOOLS_ASSEMBLY_NAME)$S$(OR_TOOLS_ASSEMBLY_NAME).csproj
$(SED) -i -e 's/@PROJECT_DOTNET_DIR@/..\/..\/gen/' \
ortools$Sdotnet$S$(OR_TOOLS_ASSEMBLY_NAME)$S$(OR_TOOLS_ASSEMBLY_NAME).csproj
$(SED) -i -e 's/@PROJECT_SOURCE_DIR@/..\/..\/../' \
ortools$Sdotnet$S$(OR_TOOLS_ASSEMBLY_NAME)$S$(OR_TOOLS_ASSEMBLY_NAME).csproj
# Pack managed project nuget

40
ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in
View File

@@ -30,42 +30,42 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="../../gen/ortools/algorithms/*.cs">
<Compile Include="@PROJECT_DOTNET_DIR@/ortools/algorithms/*.cs">
<Link>algorithms/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../gen/ortools/graph/*.cs">
<Compile Include="@PROJECT_DOTNET_DIR@/ortools/graph/*.cs">
<Link>graph/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../graph/csharp/*.cs">
<Compile Include="@PROJECT_SOURCE_DIR@/ortools/graph/csharp/*.cs">
<Link>graph/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../gen/ortools/linear_solver/*.cs">
<Compile Include="@PROJECT_DOTNET_DIR@/ortools/linear_solver/*.cs">
<Link>linear_solver/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../linear_solver/csharp/*.cs">
<Compile Include="@PROJECT_SOURCE_DIR@/ortools/linear_solver/csharp/*.cs">
<Link>linear_solver/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../gen/ortools/constraint_solver/*.cs">
<Compile Include="@PROJECT_DOTNET_DIR@/ortools/constraint_solver/*.cs">
<Link>constraint_solver/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../constraint_solver/csharp/*.cs">
<Compile Include="@PROJECT_SOURCE_DIR@/ortools/constraint_solver/csharp/*.cs">
<Link>constraint_solver/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../gen/ortools/sat/*.cs">
<Compile Include="@PROJECT_DOTNET_DIR@/ortools/sat/*.cs">
<Link>sat/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../sat/csharp/*.cs">
<Compile Include="@PROJECT_SOURCE_DIR@/ortools/sat/csharp/*.cs">
<Link>sat/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../gen/ortools/util/*.cs">
<Compile Include="@PROJECT_DOTNET_DIR@/ortools/util/*.cs">
<Link>util/%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="../../util/csharp/*.cs">
<Compile Include="@PROJECT_SOURCE_DIR@/ortools/util/csharp/*.cs">
<Link>util/%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>
@@ -89,47 +89,47 @@
<!-- Copy all .proto file(s) -->
<ItemGroup>
<Content Include="../../algorithms/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/algorithms/*.proto">
<PackagePath>content/algorithms</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="../../bop/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/bop/*.proto">
<PackagePath>content/bop</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="../../constraint_solver/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/constraint_solver/*.proto">
<PackagePath>content/constraint_solver</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="../../data/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/data/*.proto">
<PackagePath>content/data</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="../../glop/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/glop/*.proto">
<PackagePath>content/glop</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="../../graph/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/graph/*.proto">
<PackagePath>content/graph</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="../../linear_solver/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/linear_solver/*.proto">
<PackagePath>content/linear_solver</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="../../sat/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/sat/*.proto">
<PackagePath>content/sat</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="../../util/*.proto">
<Content Include="@PROJECT_SOURCE_DIR@/ortools/util/*.proto">
<PackagePath>content/util</PackagePath>
<Pack>true</Pack>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>