Skip to content

Commit 48a3487

Browse files
Update Rust export paths and add new input files for incremental builds
1 parent b71a8a9 commit 48a3487

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

src/msbuild/DNNE.targets

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,25 +110,37 @@ DNNE.targets
110110
<OutputFileName>$(DnneNativeExportsBinaryName).lib</OutputFileName>
111111
</DnneNativeExportsInput>
112112

113-
<!-- Rust: the generated Cargo.toml, lib.rs and build.rs files -->
113+
<!-- Rust: intermediate generated crate files used as inputs for incremental builds -->
114114
<DnneNativeExportsInput
115-
Include="$(DnneNativeExportsBinaryPath)dnne-rust-crate/Cargo.toml"
115+
Include="$(DnneGeneratedOutputPath)/Cargo.toml"
116116
Condition="'$(DnneBuildExports)' == 'true' AND '$(DnneLanguage)' == 'rust'" >
117117
<OutputFileName>Cargo.toml</OutputFileName>
118118
</DnneNativeExportsInput>
119119

120120
<DnneNativeExportsInput
121-
Include="$(DnneNativeExportsBinaryPath)dnne-rust-crate/lib.rs"
121+
Include="$(DnneGeneratedOutputPath)/lib.rs"
122122
Condition="'$(DnneBuildExports)' == 'true' AND '$(DnneLanguage)' == 'rust'" >
123123
<OutputFileName>lib.rs</OutputFileName>
124124
</DnneNativeExportsInput>
125125

126126
<DnneNativeExportsInput
127-
Include="$(DnneNativeExportsBinaryPath)dnne-rust-crate/build.rs"
127+
Include="$(DnneGeneratedOutputPath)/build.rs"
128128
Condition="'$(DnneBuildExports)' == 'true' AND '$(DnneLanguage)' == 'rust'" >
129129
<OutputFileName>build.rs</OutputFileName>
130130
</DnneNativeExportsInput>
131131

132+
<DnneNativeExportsInput
133+
Include="$(DnneGeneratedOutputPath)/platform.rs"
134+
Condition="'$(DnneBuildExports)' == 'true' AND '$(DnneLanguage)' == 'rust'" >
135+
<OutputFileName>platform.rs</OutputFileName>
136+
</DnneNativeExportsInput>
137+
138+
<DnneNativeExportsInput
139+
Include="$(DnneGeneratedSourceFileName)"
140+
Condition="'$(DnneBuildExports)' == 'true' AND '$(DnneLanguage)' == 'rust'" >
141+
<OutputFileName>$(TargetName)$(DnneGeneratedSourceFileExt)</OutputFileName>
142+
</DnneNativeExportsInput>
143+
132144
<!-- Add outputs and general glob to help with project cleanup -->
133145
<Clean Include="@(DnneNativeExportsInput->'$(DnneNativeExportsBinaryPath)%(OutputFileName)');$(DnneNativeExportsBinaryPath)$(DnneNativeExportsBinaryName).*"/>
134146
<Clean Include="$(DnneNativeExportsBinaryPath)dnne-rust-crate/**" />
@@ -259,7 +271,7 @@ DNNE.targets
259271
Condition="'$(DnneLanguage)' == 'rust'"
260272
Name="DnneBuildRustExports"
261273
Inputs="@(DnneNativeExportsInput)"
262-
Outputs="@(DnneNativeExportsInput->'$(DnneNativeExportsBinaryPath)%(OutputFileName)')"
274+
Outputs="@(DnneNativeExportsInput->'$(DnneNativeExportsBinaryPath)dnne-rust-crate/%(OutputFileName)')"
263275
AfterTargets="DnneBuildNativeExports">
264276

265277
<!-- Rust: Copy over platform.rs to crate, other files were emitted by dnne-gen or CreateCompileCommand -->

0 commit comments

Comments
 (0)