Skip to content

Commit 1ff70a3

Browse files
committed
Update targets to match Nasm changes.
1 parent 74932ad commit 1ff70a3

File tree

1 file changed

+29
-11
lines changed

1 file changed

+29
-11
lines changed

yasm.targets

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,33 @@
2323
AssemblyName="Microsoft.Build.Tasks.v4.0">
2424
<Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
2525
</UsingTask>
26+
<Target
27+
Name="_WriteYasmTlogs"
28+
Condition="'@(YASM)' != '' and '@(SelectedFiles)' == ''">
29+
<ItemGroup>
30+
<YASM Remove="@(YASM)" Condition="'%(YASM.ExcludedFromBuild)' == 'true' or '%(YASM.ObjectFileName)' == ''" />
31+
</ItemGroup>
32+
<ItemGroup Condition="'@(YASM)' != ''">
33+
<_YasmReadTlog Include="^%(YASM.FullPath);%(YASM.AdditionalDependencies)" />
34+
<_YasmWriteTlog Include="^%(YASM.FullPath);$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '%(YASM.ObjectFileName)'))" />
35+
</ItemGroup>
36+
<WriteLinesToFile
37+
Condition="'@(_YasmReadTlog)' != ''"
38+
File="$(TLogLocation)Yasm.read.1u.tlog"
39+
Lines="@(_YasmReadTlog->MetaData('Identity')->ToUpperInvariant());"
40+
Overwrite="true"
41+
Encoding="Unicode"/>
42+
<WriteLinesToFile
43+
Condition="'@(_YasmWriteTlog)' != ''"
44+
File="$(TLogLocation)Yasm.write.1u.tlog"
45+
Lines="@(_YasmWriteTlog->MetaData('Identity')->ToUpperInvariant());"
46+
Overwrite="true"
47+
Encoding="Unicode"/>
48+
<ItemGroup>
49+
<_YasmReadTlog Remove="@(_YasmReadTlog)" />
50+
<_YasmWriteTlog Remove="@(_YasmWriteTlog)" />
51+
</ItemGroup>
52+
</Target>
2653
<Target
2754
Name="_YASM"
2855
BeforeTargets="$(YASMBeforeTargets)"
@@ -34,25 +61,16 @@
3461
<ItemGroup Condition="'@(SelectedFiles)' != ''">
3562
<YASM Remove="@(YASM)" Condition="'%(Identity)' != '@(SelectedFiles)'" />
3663
</ItemGroup>
37-
<ItemGroup>
38-
<YASM_tlog Include="%(YASM.ObjectFileName)" Condition="'%(YASM.ObjectFileName)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">
39-
<Source>@(YASM, '|')</Source>
40-
</YASM_tlog>
41-
</ItemGroup>
4264
<Message
4365
Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"
4466
Importance="High"
4567
Text="%(YASM.ExecutionDescription)" />
46-
<WriteLinesToFile
47-
Condition="'@(YASM_tlog)' != '' and '%(YASM_tlog.ExcludedFromBuild)' != 'true'"
48-
File="$(IntDir)$(ProjectName).write.1.tlog"
49-
Lines="^%(YASM_tlog.Source);@(YASM_tlog-&gt;'%(Fullpath)')"/>
5068
<YASM
5169
Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"
5270
Inputs="%(YASM.Inputs)"
5371
ObjectFileName="%(YASM.ObjectFileName)"
54-
SymbolsPrefix="%(NASM.SymbolsPrefix)"
55-
SymbolsPostfix="%(NASM.SymbolsPostfix)"
72+
SymbolsPrefix="%(YASM.SymbolsPrefix)"
73+
SymbolsPostfix="%(YASM.SymbolsPostfix)"
5674
GenerateDebugInformation="%(YASM.GenerateDebugInformation)"
5775
IncludePaths="%(YASM.IncludePaths)"
5876
PreIncludeFiles="%(YASM.PreIncludeFiles)"

0 commit comments

Comments
 (0)